Merge remote-tracking branch 'github/pull/472'

[chef.git] / roles / bytemark.rb

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 7019492e4f8f8fbb5701f04d4e1734b476e34312..93f652b1dc72a8d27bb8278fd844e76613d0b9d0 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -5,12 +5,14 @@ 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"],
     :roles => {
       :internal => {
         :inet => {
           :prefix => "20",
-          :gateway => "10.0.32.20"
+          :gateway => "10.0.32.20",
+          :routes => {
+            "10.0.0.0/8" => { :via => "10.0.32.20" }
+          }
         }
       },
       :external => {
@@ -25,10 +27,18 @@ default_attributes(
         }
       }
     }
+  },
+  :web => {
+    :fileserver => "grisu",
+    :readonly_database_host => "katla.bm.openstreetmap.org"
   }
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["10.0.32.20"],
+    :search => ["bm.openstreetmap.org", "openstreetmap.org"]
+  },
   :ntp => {
     :servers => ["0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org"]
   }