Upgrade remaining UCL machines to chef 13

diff --git a/roles/eustace.rb b/roles/eustace.rb
index 6de17c2c18c0063dcfe0e7b6665349bec3dd73d2..4aa2fdd31e80d0399775fc98663a51ac805a869d 100644 (file)
--- a/roles/eustace.rb
+++ b/roles/eustace.rb
@@ -2,11 +2,6 @@ name "eustace"
 description "Master role applied to eustace"
 
 default_attributes(
 description "Master role applied to eustace"
 
 default_attributes(

-  :chef => {
-    :client => {
-      :version => "13.6.4"
-    }
-  },

   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

diff --git a/roles/ridley.rb b/roles/ridley.rb
index e83f9f2b60c29ff19f7e0ca1602c6e40076d60bd..f9ec9ebc782a42d42af0eab6403fc8ffdf4db4ea 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,11 +2,6 @@ name "ridley"
 description "Master role applied to ridley"
 
 default_attributes(
 description "Master role applied to ridley"
 
 default_attributes(

-  :chef => {
-    :client => {
-      :version => "13.6.4"
-    }
-  },

   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"

diff --git a/roles/ucl.rb b/roles/ucl.rb
index 27064ea2359a8a42a83c83705ae899c20a1b3777..7715e629aaaf812e555f8f510505040783b0999c 100644 (file)
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -2,6 +2,11 @@ name "ucl"
 description "Role applied to all servers at UCL"
 
 default_attributes(
 description "Role applied to all servers at UCL"
 
 default_attributes(

+  :chef => {
+    :client => {
+      :version => "13.6.4"
+    }
+  },

   :location => "Slough, England",
   :networking => {
     :roles => {
   :location => "Slough, England",
   :networking => {
     :roles => {

diff --git a/roles/urmel.rb b/roles/urmel.rb
index 30d3a2010af10947f5d1534e0c6403c949af80b6..dba68ec664c5bf6dec2a1cf4c0d36de5d0cd4436 100644 (file)
--- a/roles/urmel.rb
+++ b/roles/urmel.rb
@@ -2,11 +2,6 @@ name "urmel"
 description "Master role applied to urmel"
 
 default_attributes(
 description "Master role applied to urmel"
 
 default_attributes(

-  :chef => {
-    :client => {
-      :version => "13.6.4"
-    }
-  },

   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {