From: Tom Hughes <tom@compton.nu>
Date: Mon, 27 Nov 2017 15:54:36 +0000 (+0000)
Subject: Upgrade remaining machines to chef 13
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/d8b4922ddbdd6b29980ce67ff75850783be28534

Upgrade remaining machines to chef 13
---

diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb
index 70815b1fc..dcf847501 100644
--- a/cookbooks/chef/attributes/default.rb
+++ b/cookbooks/chef/attributes/default.rb
@@ -5,4 +5,4 @@ default[:apt][:sources] = node[:apt][:sources] | ["opscode"]
 default[:chef][:server][:version] = "12.13.0-1"
 
 # Set the default client version
-default[:chef][:client][:version] = "12.21.26"
+default[:chef][:client][:version] = "13.6.4"
diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 375d7611d..209717f76 100644
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -2,11 +2,6 @@ name "bytemark"
 description "Role applied to all servers at Bytemark"
 
 default_attributes(
-  :chef => {
-    :client => {
-      :version => "13.6.4"
-    }
-  },
   :hosted_by => "Bytemark",
   :location => "York, England",
   :networking => {
diff --git a/roles/ic.rb b/roles/ic.rb
index 81beb9efa..33e99624b 100644
--- a/roles/ic.rb
+++ b/roles/ic.rb
@@ -7,11 +7,6 @@ default_attributes(
       :icladmin => { :status => :user }
     }
   },
-  :chef => {
-    :client => {
-      :version => "13.6.4"
-    }
-  },
   :networking => {
     :nameservers => ["8.8.8.8", "146.179.159.177"],
     :roles => {
diff --git a/roles/ucl.rb b/roles/ucl.rb
index 7715e629a..27064ea23 100644
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -2,11 +2,6 @@ name "ucl"
 description "Role applied to all servers at UCL"
 
 default_attributes(
-  :chef => {
-    :client => {
-      :version => "13.6.4"
-    }
-  },
   :location => "Slough, England",
   :networking => {
     :roles => {