From: Tom Hughes <tom@compton.nu>
Date: Sun, 13 Apr 2014 18:00:05 +0000 (+0100)
Subject: Use 12.04 chef packages on 12.10
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/e5cfdc9914e4d57a2e7cb5cfb370eeb97683f745?ds=sidebyside

Use 12.04 chef packages on 12.10
---

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index b0d30cc9d..7a5805490 100644
--- 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"
@@ -38,7 +43,7 @@ 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