Update chef client to 12.16.42

diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb
index 1374353007620cd1f320ababb2b77187f00a97cc..a17697976f51edac2591b0ff8d726c9b3f334c8f 100644 (file)
--- a/cookbooks/chef/attributes/default.rb
+++ b/cookbooks/chef/attributes/default.rb
@@ -5,4 +5,4 @@ default[:apt][:sources] = node[:apt][:sources] | ["opscode"]
 default[:chef][:server][:version] = "12.9.1-1"
 
 # Set the default client version
 default[:chef][:server][:version] = "12.9.1-1"
 
 # Set the default client version

-default[:chef][:client][:version] = "12.14.89-1"
+default[:chef][:client][:version] = "12.16.42"

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index c6b5b010228ebb3beeb0a5eadd11a2db1532bf18..c06384be7a87f37930dac12c1e8c384a1c32d05a 100644 (file)
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -17,7 +17,8 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-chef_package = "chef_#{node[:chef][:client][:version]}_amd64.deb"
+chef_version = node[:chef][:client][:version]
+chef_package = "chef_#{chef_version}-1_amd64.deb"

 
 directory "/var/cache/chef" do
   owner "root"
 
 directory "/var/cache/chef" do
   owner "root"


@@ -35,7 +36,7 @@ Dir.glob("/var/cache/chef/chef_*.deb").each do |deb|
 end
 
 remote_file "/var/cache/chef/#{chef_package}" do
 end
 
 remote_file "/var/cache/chef/#{chef_package}" do

-  source "https://packages.chef.io/stable/ubuntu/12.04/#{chef_package}"
+  source "https://packages.chef.io/files/stable/chef/#{chef_version}/ubuntu/16.04/#{chef_package}"

   owner "root"
   group "root"
   mode 0o644
   owner "root"
   group "root"
   mode 0o644


@@ -45,7 +46,7 @@ end
 
 dpkg_package "chef" do
   source "/var/cache/chef/#{chef_package}"
 
 dpkg_package "chef" do
   source "/var/cache/chef/#{chef_package}"

-  version node[:chef][:client][:version]
+  version "#{chef_version}-1"

 end
 
 directory "/etc/chef" do
 end
 
 directory "/etc/chef" do