Fix en.openstreetmap.town container

[chef.git] / roles / bytemark.rb

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 8c65a4b438bd86cc90d1c7e3a789479f38de277f..8f23bd5d02a806ddcb5d0a385d64a48fdeffb7f6 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -2,19 +2,40 @@ name "bytemark"
 description "Role applied to all servers at Bytemark"
 
 default_attributes(
 description "Role applied to all servers at Bytemark"
 
 default_attributes(

+  :hosted_by => "Bytemark",
+  :location => "York, England",

   :networking => {
   :networking => {

-    :nameservers => [ "8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844" ],

     :roles => {
     :roles => {

+      :internal => {
+        :inet => {
+          :prefix => "20",
+          :gateway => "10.0.32.20",
+          :routes => {
+            "10.0.0.0/8" => { :via => "10.0.32.20" }
+          }
+        }
+      },

       :external => {
       :external => {

-        :zone => "bm"
+        :inet => {
+          :prefix => "28",
+          :gateway => "89.16.162.17"
+        },
+        :inet6 => {
+          :prefix => "64",
+          :gateway => "fe80::1"
+        }

       }
     }
   }
 )
 
 override_attributes(
       }
     }
   }
 )
 
 override_attributes(

+  :networking => {
+    :nameservers => ["8.8.8.8", "8.8.4.4"],
+    :search => ["bm.openstreetmap.org", "openstreetmap.org"]
+  },

   :ntp => {
   :ntp => {

-    :servers => [ "0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org" ]
+    :servers => ["0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org"]

   }
 )
 
   }
 )