From 890e193607b788e7ce10b7e0508e52eb685b5cfb Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 13 Apr 2014 18:32:47 +0100 Subject: [PATCH] Update chef client to 11.12.2 --- cookbooks/chef/attributes/default.rb | 2 +- cookbooks/chef/recipes/default.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb index 3a14f0f82..63fc2cf37 100644 --- a/cookbooks/chef/attributes/default.rb +++ b/cookbooks/chef/attributes/default.rb @@ -2,7 +2,7 @@ default[:apt][:sources] = node[:apt][:sources] | [ "opscode" ] # Set the default client version -default[:chef][:client][:version] = "11.10.2-1" +default[:chef][:client][:version] = "11.12.2-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 5ca080cb4..b0d30cc9d 100644 --- a/cookbooks/chef/recipes/default.rb +++ b/cookbooks/chef/recipes/default.rb @@ -19,7 +19,7 @@ chef_gem "pony" -chef_package = "chef_#{node[:chef][:client][:version]}.ubuntu.11.04_amd64.deb" +chef_package = "chef_#{node[:chef][:client][:version]}_amd64.deb" directory "/var/cache/chef" do owner "root" @@ -27,7 +27,7 @@ directory "/var/cache/chef" do mode 0755 end -Dir.glob("/var/cache/chef/chef_*.ubuntu.11.04_amd64.deb").each do |deb| +Dir.glob("/var/cache/chef/chef_*.deb").each do |deb| if deb != "/var/cache/chef/#{chef_package}" file deb do action :delete @@ -38,7 +38,7 @@ end remote_file "/var/cache/chef/#{chef_package}" do action :create_if_missing - source "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/11.04/x86_64/#{chef_package}" + source "https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/#{node[:platform_version]}/x86_64/#{chef_package}" owner "root" group "root" mode 0644 -- 2.43.2