Upgrade remaining machines to chef 13

diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb
index 70815b1fc5a68fc6f0fd3a2dc36e61a3cd9cda0a..dcf847501bbfe2451e85a210b0b61765f20f0c43 100644 (file)
--- 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][: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 375d7611dedd86df848ee2fa6d3b4ccedc51e114..209717f768067ed493ee89381d6d9b690c117779 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -2,11 +2,6 @@ name "bytemark"
 description "Role applied to all servers at Bytemark"
 
 default_attributes(
 description "Role applied to all servers at Bytemark"
 
 default_attributes(

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

   :hosted_by => "Bytemark",
   :location => "York, England",
   :networking => {
   :hosted_by => "Bytemark",
   :location => "York, England",
   :networking => {

diff --git a/roles/ic.rb b/roles/ic.rb
index 81beb9efab8610c1dc202da126d26333b15124d7..33e99624b2f17f23fd99fd2538aa0ef19f885ec5 100644 (file)
--- a/roles/ic.rb
+++ b/roles/ic.rb
@@ -7,11 +7,6 @@ default_attributes(
       :icladmin => { :status => :user }
     }
   },
       :icladmin => { :status => :user }
     }
   },

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

   :networking => {
     :nameservers => ["8.8.8.8", "146.179.159.177"],
     :roles => {
   :networking => {
     :nameservers => ["8.8.8.8", "146.179.159.177"],
     :roles => {

diff --git a/roles/ucl.rb b/roles/ucl.rb
index 7715e629aaaf812e555f8f510505040783b0999c..27064ea2359a8a42a83c83705ae899c20a1b3777 100644 (file)
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -2,11 +2,6 @@ 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 => {