Upgrade bytemark machines to chef 13

[chef.git] / roles / bytemark.rb

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 95cc5628f8f15a2338b63811618146a683aa21b2..375d7611dedd86df848ee2fa6d3b4ccedc51e114 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -2,10 +2,15 @@ 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 => {
-    :nameservers => ["8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844"],
+    :nameservers => ["80.68.80.24", "80.68.80.25", "2001:41c8:2::1", "2001:41c8:2::2"],
     :roles => {
       :internal => {
         :inet => {
@@ -27,10 +32,9 @@ default_attributes(
     }
   },
   :web => {
-    :backends => %w(rails4 rails5),
+    :backends => %w[rails4 rails5],
     :fileserver => "grisu",
-    :readonly_database_host => "katla.bm.openstreetmap.org",
-    :memcached_servers => %w(rails4.bm rails5.bm)
+    :readonly_database_host => "katla.bm.openstreetmap.org"
   }
 )