From: Tom Hughes <tom@compton.nu>
Date: Thu, 26 Mar 2015 19:16:31 +0000 (+0000)
Subject: Upgrade everything except ridley and ouroboros to chef 12
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/ee6580d55e1bbed06787ac3e5f18af1bb35c8e6d

Upgrade everything except ridley and ouroboros to chef 12
---

diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb
index 4b0e6ea51..0dbde37d1 100644
--- a/cookbooks/chef/attributes/default.rb
+++ b/cookbooks/chef/attributes/default.rb
@@ -5,7 +5,7 @@ default[:apt][:sources] = node[:apt][:sources] | ["opscode"]
 default[:chef][:server][:version] = "11.1.3-1"
 
 # Set the default client version
-default[:chef][:client][:version] = "11.18.0-1"
+default[:chef][:client][:version] = "12.1.2-1"
 
 # A list of gems needed by chef recipes
 default[:chef][:gems] = []
diff --git a/roles/errol.rb b/roles/errol.rb
index a26658036..69b0d8db4 100644
--- a/roles/errol.rb
+++ b/roles/errol.rb
@@ -2,11 +2,6 @@ name "errol"
 description "Master role applied to errol"
 
 default_attributes(
-  :chef => {
-    :client => {
-      :version => "12.1.2-1"
-    }
-  },
   :devices => {
     :osdsk => {
       :comment => "First os disk",
diff --git a/roles/eustace.rb b/roles/eustace.rb
index 51af9e243..ccba625c9 100644
--- a/roles/eustace.rb
+++ b/roles/eustace.rb
@@ -2,11 +2,6 @@ name "eustace"
 description "Master role applied to eustace"
 
 default_attributes(
-  :chef => {
-    :client => {
-      :version => "12.1.2-1"
-    }
-  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 85ba5e60d..4bcb8fb26 100644
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -5,11 +5,6 @@ default_attributes(
   :apt => {
     :sources => ["ubuntugis-unstable"]
   },
-  :chef => {
-    :client => {
-      :version => "12.1.2-1"
-    }
-  },
   :git => {
     :allowed_nodes => "*:*",
     :user => "chefrepo",
diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index a6d772e43..bf509ddde 100644
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -22,11 +22,6 @@ default_attributes(
       :threads_per_child => 50
     }
   },
-  :chef => {
-    :client => {
-      :version => "12.1.2-1"
-    }
-  },
   :postgresql => {
     :settings => {
       :defaults => {
diff --git a/roles/noquiklos.rb b/roles/noquiklos.rb
index c25793648..8103dcfc2 100644
--- a/roles/noquiklos.rb
+++ b/roles/noquiklos.rb
@@ -2,11 +2,6 @@ name "noquiklos"
 description "Master role applied to noquiklos"
 
 default_attributes(
-  :chef => {
-    :client => {
-      :version => "12.1.2-1"
-    }
-  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
diff --git a/roles/ouroboros.rb b/roles/ouroboros.rb
index 0895ff5b1..d1d5d7271 100644
--- a/roles/ouroboros.rb
+++ b/roles/ouroboros.rb
@@ -2,6 +2,11 @@ name "ouroboros"
 description "Master role applied to ouroboros"
 
 default_attributes(
+  :chef => {
+    :client => {
+      :version => "11.18.0-1"
+    }
+  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
diff --git a/roles/ridley.rb b/roles/ridley.rb
index efcdd4c7d..7637af87d 100644
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -8,6 +8,11 @@ default_attributes(
       :certificate_chain => "startcom"
     }
   },
+  :chef => {
+    :client => {
+      :version => "11.18.0-1"
+    }
+  },
   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
diff --git a/roles/urmel.rb b/roles/urmel.rb
index 813dae060..5c5102333 100644
--- a/roles/urmel.rb
+++ b/roles/urmel.rb
@@ -2,11 +2,6 @@ name "urmel"
 description "Master role applied to urmel"
 
 default_attributes(
-  :chef => {
-    :client => {
-      :version => "12.1.2-1"
-    }
-  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {