Rely on Last-Modified and/or ETag to control chef client downloads

[chef.git] / cookbooks / chef / recipes / default.rb

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