Reconfigure ascalon for move to Wolfson House

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index b27b9e0870302911bc52511ea505ab6e43e38101..bc2bac6f236a1b7842659001105fe4cbfe4c0726 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -5,10 +5,10 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0",
-        :role => :internal,
+        :interface => "eth1",
+        :role => :external,
         :family => :inet,
-        :address => "10.0.0.18"
+        :address => "128.40.45.193"
       }
     }
   },
@@ -20,6 +20,6 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wates]",
+  "role[ucl-wolfson]",
   "role[roundup]"
 )

diff --git a/roles/ucl-wates.rb b/roles/ucl-wates.rb
index c571bf61f96ff7e3c02e1c59334929f88a6c66c4..80cf8ff5ea262881825dc5cfd58f97a72e683d7e 100644 (file)
--- a/roles/ucl-wates.rb
+++ b/roles/ucl-wates.rb
@@ -1,6 +1,26 @@
 name "ucl-wates"
 description "Role applied to all servers at UCL which are in Wates House"
 
+default_attributes(
+  :networking => {
+    :roles => {
+      :internal => {
+        :inet => {
+          :prefix => "20",
+          :gateway => "10.0.0.3"
+        }
+      },
+      :external => {
+        :zone => "ucl",
+        :inet => {
+          :prefix => "24",
+          :gateway => "128.40.168.126"
+        }
+      }
+    }
+  }
+)
+
 override_attributes(
   :networking => {
     :nameservers => [ "10.0.0.3", "8.8.8.8", "8.8.4.4" ],

diff --git a/roles/ucl-wolfson.rb b/roles/ucl-wolfson.rb
new file mode 100644 (file)
index 0000000..882621d
--- /dev/null
+++ b/roles/ucl-wolfson.rb
@@ -0,0 +1,27 @@
+name "ucl-wolfson"
+description "Role applied to all servers at UCL which are in Wolfson House"
+
+default_attributes(
+  :networking => {
+    :roles => {
+      :external => {
+        :zone => "ucl",
+        :inet => {
+          :prefix => "27",
+          :gateway => "128.40.45.222"
+        }
+      }
+    }
+  }
+)
+
+override_attributes(
+  :networking => {
+    :nameservers => [ "8.8.8.8", "8.8.4.4" ],
+    :search => [ "openstreetmap.org" ]
+  }
+)
+
+run_list(
+  "role[ucl]"
+)

diff --git a/roles/ucl.rb b/roles/ucl.rb
index e61a04f7dfafd69b06d680ab58efaada2dd5cbd6..b4bb93a47534e473acc6d321c6692ff91fbdf077 100644 (file)
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -5,23 +5,6 @@ default_attributes(
   :bind => {
     :forwarders => [ "144.82.100.1", "144.82.100.41" ]
   },
-  :networking => {
-    :roles => {
-      :internal => {
-        :inet => {
-          :prefix => "20",
-          :gateway => "10.0.0.3"
-        }
-      },
-      :external => {
-        :zone => "ucl",
-        :inet => {
-          :prefix => "24",
-          :gateway => "128.40.168.126"
-        }
-      }
-    }
-  },
   :sysctl => {
     :sack => {
       :comment => "Disable SACK as the UCL firewall breaks it",
@@ -30,7 +13,6 @@ default_attributes(
       }
     }
   }
-
 )
 
 override_attributes(