Switch bytemark servers to use katla for readonly queries

[chef.git] / roles / bytemark.rb

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index a8159ca664d6e9501c8cde0c0419be71cd9198cb..6d539ff5f65207391a46cbcd56e69a00bfb4b177 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -7,14 +7,36 @@ default_attributes(
   :networking => {
     :nameservers => ["8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844"],
     :roles => {
+      :internal => {
+        :inet => {
+          :prefix => "20",
+          :gateway => "10.0.32.20"
+        }
+      },
       :external => {
-        :zone => "bm"
+        :zone => "bm",
+        :inet => {
+          :prefix => "28",
+          :gateway => "89.16.162.17"
+        },
+        :inet6 => {
+          :prefix => "64",
+          :gateway => "fe80::1"
+        }
       }
     }
+  },
+  :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"]
   }