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

[chef.git] / roles / bytemark.rb

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 7bcd61406f60a57eccd130c5cc5d1204433b2624..4e80daa56f7098c42117b95c668ca9159d51bf77 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -2,19 +2,46 @@ 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 => [ "[2001:41c8:2::2]", "[2001:41c8:2::1]", "80.68.80.25", "80.68.80.24" ],
+    :nameservers => ["10.0.32.20"],

     :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 => {
+    :backends => %w[rails4 rails5],
+    :fileserver => "grisu",
+    :readonly_database_host => "katla.bm.openstreetmap.org"

   }
 )
 
 override_attributes(
   }
 )
 
 override_attributes(

+  :networking => {
+    :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"]

   }
 )
 
   }
 )