Set correct ISP role for spike-0[45] and thorn-0[45]

[chef.git] / roles / bytemark.rb

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 96dab6a06a5cd99c808815f04046b76af344658a..7019492e4f8f8fbb5701f04d4e1734b476e34312 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -2,11 +2,27 @@ name "bytemark"
 description "Role applied to all servers at Bytemark"
 
 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"
+        }
+      },
       :external => {
-        :zone => "bm"
+        :zone => "bm",
+        :inet => {
+          :prefix => "28",
+          :gateway => "89.16.162.17"
+        },
+        :inet6 => {
+          :prefix => "64",
+          :gateway => "fe80::1"
+        }
       }
     }
   }