From: Tom Hughes <tom@compton.nu>
Date: Fri, 9 Dec 2016 21:33:42 +0000 (+0000)
Subject: Update chef client to 12.16.42
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/83761ddfb2f6ba694f925098f371a82a19e7ef1b?hp=777280b61f312d00aa7c5c4cf2b3b81d85e66469

Update chef client to 12.16.42
---

diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb
index 137435300..a17697976 100644
--- 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][: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 c6b5b0102..c06384be7 100644
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -17,7 +17,8 @@
 # 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"
@@ -35,7 +36,7 @@ Dir.glob("/var/cache/chef/chef_*.deb").each do |deb|
 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
@@ -45,7 +46,7 @@ end
 
 dpkg_package "chef" do
   source "/var/cache/chef/#{chef_package}"
-  version node[:chef][:client][:version]
+  version "#{chef_version}-1"
 end
 
 directory "/etc/chef" do