Get rid of unused web-backend role

[chef.git] / roles / bytemark.rb

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index a8159ca664d6e9501c8cde0c0419be71cd9198cb..c10a9a090001719dc26e70be4c363442d021c9b8 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -5,16 +5,40 @@ default_attributes(
   :hosted_by => "Bytemark",
   :location => "York, England",
   :networking => {
   :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 => {
     :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"
+        :zone => "bm",
+        :inet => {
+          :prefix => "28",
+          :gateway => "89.16.162.17"
+        },
+        :inet6 => {
+          :prefix => "64",
+          :gateway => "fe80::1"
+        }

       }
     }
       }
     }

+  },
+  :web => {
+    :fileserver => "grisu",
+    :readonly_database_host => "snap-02.ucl.openstreetmap.org"

   }
 )
 
 override_attributes(
   }
 )
 
 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"]
   }
   :ntp => {
     :servers => ["0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org"]
   }