Upgrade everything except ridley and ouroboros to chef 12

diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb
index 4b0e6ea51c92effafe787432a220060818057823..0dbde37d1a236653d9e95791d124eacfc8cab796 100644 (file)
--- 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 a2665803657aca4d958a2629f830cd2239f8f4c4..69b0d8db479d49642c4a87d764a88de7885b34ed 100644 (file)
--- 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 51af9e243846072a8b6067de414de3b49e1cfee6..ccba625c971bdfd66ea2ac02bdfd0748c5e71820 100644 (file)
--- 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 85ba5e60d09ca18f619053c8aa7f6d448a38218c..4bcb8fb268bf6b9c4ea79b6e5849402932d22c2c 100644 (file)
--- 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 a6d772e43c2859875071026d914ed11ee884ae03..bf509dddecf4da211f6f31327ed28f8351c5f2f7 100644 (file)
--- 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 c25793648a3425f62724f3f2478adf2669bfeedf..8103dcfc2d10803b3db1a1ae495a34fe00981cb0 100644 (file)
--- 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 0895ff5b16f3528c6a0157f409296587876a3bbc..d1d5d727118e48b6d3850d1cd7ef295c4b630812 100644 (file)
--- 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 efcdd4c7dae67bd72b183e9358a6babadb07ad12..7637af87dc34394839fd89a6ab87adbd6b05b681 100644 (file)
--- 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 813dae06043af360816389f8cbe9643492664321..5c5102333b15e1c18d0a8dd03784f1bf7e2dbebe 100644 (file)
--- 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 => {