Switch bytemark machines to use Google DNS

[chef.git] / roles / bytemark.rb

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 7019492e4f8f8fbb5701f04d4e1734b476e34312..081eb9982784b2355cbaf05e0ce136a12f38c64a 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -5,7 +5,7 @@ default_attributes(
   :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 => ["8.8.8.8", "8.8.4.4"],
     :roles => {
       :internal => {
         :inet => {
@@ -25,10 +25,18 @@ default_attributes(
         }
       }
     }
+  },
+  :web => {
+    :backends => %w[rails4 rails5],
+    :fileserver => "grisu",
+    :readonly_database_host => "katla.bm.openstreetmap.org"
   }
 )
 
 override_attributes(
+  :networking => {
+    :search => ["bm.openstreetmap.org", "openstreetmap.org"]
+  },
   :ntp => {
     :servers => ["0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org"]
   }