Update chef client to 12.3.0

diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb
index f2a793fad27bb488f4afa0eac33dfdfebe798f7f..e572627f4f7000211b7594c403428f563a6f2a4b 100644 (file)
--- a/cookbooks/chef/attributes/default.rb
+++ b/cookbooks/chef/attributes/default.rb
@@ -5,7 +5,7 @@ default[:apt][:sources] = node[:apt][:sources] | ["opscode"]
 default[:chef][:server][:version] = "11.1.3-1"
 
 # Set the default client version
-default[:chef][:client][:version] = "12.2.1-1"
+default[:chef][:client][:version] = "12.3.0-1"
 
 # A list of gems needed by chef recipes
 default[:chef][:gems] = []

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index a5c1042151cdd203265862412b528419df043945..096c6dfdeef82d8b459d318476a1391801e35a33 100644 (file)
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -21,12 +21,6 @@ chef_gem "pony"
 
 chef_package = "chef_#{node[:chef][:client][:version]}_amd64.deb"
 
-chef_platform = case node[:platform_version]
-                when "12.10" then "12.04"
-                when "14.04" then "13.04"
-                else node[:platform_version]
-                end
-
 directory "/var/cache/chef" do
   owner "root"
   group "root"
@@ -43,7 +37,7 @@ Dir.glob("/var/cache/chef/chef_*.deb").each do |deb|
 end
 
 remote_file "/var/cache/chef/#{chef_package}" do
-  source "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/#{chef_platform}/x86_64/#{chef_package}"
+  source "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/10.04/x86_64/#{chef_package}"
   owner "root"
   group "root"
   mode 0644