Use "stable" as the default Chef channel
Previously the default channel was "current", but after discussion with @coderanger on GH-6979, it seems like this was a poor design decision. Instead, we should use the stable channel and allow users to opt-in to prerelease versions. Fixes GH-6979
This commit is contained in:
parent
3c34b67ba1
commit
8c68c6ec70
|
@ -38,7 +38,7 @@ module VagrantPlugins
|
||||||
|
|
||||||
# The channel from which to download Chef. Currently known values are
|
# The channel from which to download Chef. Currently known values are
|
||||||
# "current" and "stable", but more may be added in the future. The
|
# "current" and "stable", but more may be added in the future. The
|
||||||
# default is "current".
|
# default is "stable".
|
||||||
# @return [String]
|
# @return [String]
|
||||||
attr_accessor :channel
|
attr_accessor :channel
|
||||||
|
|
||||||
|
@ -68,10 +68,9 @@ module VagrantPlugins
|
||||||
def prerelease=(value)
|
def prerelease=(value)
|
||||||
STDOUT.puts <<-EOH
|
STDOUT.puts <<-EOH
|
||||||
[DEPRECATED] The configuration `chef.prerelease' has been deprecated. Please use
|
[DEPRECATED] The configuration `chef.prerelease' has been deprecated. Please use
|
||||||
`chef.channel' instead. The default value for channel is "current", which
|
`chef.channel' instead. The default value for channel is "stable", which
|
||||||
includes prelease versions of Chef Client and the Chef Development Kit. You can
|
includes the latest published versions of the Chef Client. You can choose to use
|
||||||
probably just remove the `prerelease' setting from your Vagrantfile and things
|
prerelease versions by setting the channel to "current".
|
||||||
will continue working as expected.
|
|
||||||
EOH
|
EOH
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -94,7 +93,7 @@ EOH
|
||||||
@product = "chef" if @product == UNSET_VALUE
|
@product = "chef" if @product == UNSET_VALUE
|
||||||
@install = true if @install == UNSET_VALUE
|
@install = true if @install == UNSET_VALUE
|
||||||
@log_level = :info if @log_level == UNSET_VALUE
|
@log_level = :info if @log_level == UNSET_VALUE
|
||||||
@channel = "current" if @channel == UNSET_VALUE
|
@channel = "stable" if @channel == UNSET_VALUE
|
||||||
@version = :latest if @version == UNSET_VALUE
|
@version = :latest if @version == UNSET_VALUE
|
||||||
@installer_download_path = nil if @installer_download_path == UNSET_VALUE
|
@installer_download_path = nil if @installer_download_path == UNSET_VALUE
|
||||||
|
|
||||||
|
|
|
@ -57,9 +57,9 @@ describe VagrantPlugins::Chef::Config::Base do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "#channel" do
|
describe "#channel" do
|
||||||
it "defaults to \"current\"" do
|
it "defaults to \"stable\"" do
|
||||||
subject.finalize!
|
subject.finalize!
|
||||||
expect(subject.channel).to eq("current")
|
expect(subject.channel).to eq("stable")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -43,14 +43,16 @@ understand their purpose.
|
||||||
|
|
||||||
- `product` (string) - The name of the Chef product to install. The default
|
- `product` (string) - The name of the Chef product to install. The default
|
||||||
value is "chef", which corresponds to the Chef Client. You can also specify
|
value is "chef", which corresponds to the Chef Client. You can also specify
|
||||||
"chefdk", which will install the Chef Development Kit.
|
"chefdk", which will install the Chef Development Kit. At the time of this
|
||||||
|
writing, the ChefDK is only available through the "current" channel, so you
|
||||||
|
will need to update that value as well.
|
||||||
|
|
||||||
- `channel` (string) - The release channel from which to pull the Chef Client
|
- `channel` (string) - The release channel from which to pull the Chef Client
|
||||||
or the Chef Development Kit. The default value is `"current"` which will pull
|
or the Chef Development Kit. The default value is `"stable"` which will pull
|
||||||
ChefDK and the latest released version of Chef. For older versions, you may
|
the latest stable version of the Chef Client. For newer versions, or if you
|
||||||
need to change the channel to "stable". Because Chef Software floats the
|
wish to install the Chef Development Kit, you may need to change the channel
|
||||||
versions that are contained in the channel, they may change and Vagrant is
|
to "current". Because Chef Software floats the versions that are contained in
|
||||||
unable to detect this.
|
the channel, they may change and Vagrant is unable to detect this.
|
||||||
|
|
||||||
- `version` (string) - The version of Chef to install on the guest. If Chef is
|
- `version` (string) - The version of Chef to install on the guest. If Chef is
|
||||||
already installed on the system, the installed version is compared with the
|
already installed on the system, the installed version is compared with the
|
||||||
|
|
Loading…
Reference in New Issue