From: Tom Hughes <tom@compton.nu>
Date: Mon, 27 Nov 2017 15:13:50 +0000 (+0000)
Subject: Upgrade remaining UCL machines to chef 13
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/07074011fa21aef90a1c7cacb177418aac78739b?ds=sidebyside

Upgrade remaining UCL machines to chef 13
---

diff --git a/roles/eustace.rb b/roles/eustace.rb
index 6de17c2c1..4aa2fdd31 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 => "13.6.4"
-    }
-  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
diff --git a/roles/ridley.rb b/roles/ridley.rb
index e83f9f2b6..f9ec9ebc7 100644
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,11 +2,6 @@ name "ridley"
 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"
diff --git a/roles/ucl.rb b/roles/ucl.rb
index 27064ea23..7715e629a 100644
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -2,6 +2,11 @@ name "ucl"
 description "Role applied to all servers at UCL"
 
 default_attributes(
+  :chef => {
+    :client => {
+      :version => "13.6.4"
+    }
+  },
   :location => "Slough, England",
   :networking => {
     :roles => {
diff --git a/roles/urmel.rb b/roles/urmel.rb
index 30d3a2010..dba68ec66 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 => "13.6.4"
-    }
-  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {