From 1a1b82f02357f19b9b953f1264c7ea3587c74568 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 23 Jun 2014 13:26:18 +0100
Subject: [PATCH] Reconfigure ascalon for move to Wolfson House

---
 roles/ascalon.rb     |  8 ++++----
 roles/ucl-wates.rb   | 20 ++++++++++++++++++++
 roles/ucl-wolfson.rb | 27 +++++++++++++++++++++++++++
 roles/ucl.rb         | 18 ------------------
 4 files changed, 51 insertions(+), 22 deletions(-)
 create mode 100644 roles/ucl-wolfson.rb

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index b27b9e087..bc2bac6f2 100644
--- 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 c571bf61f..80cf8ff5e 100644
--- 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
index 000000000..882621d0d
--- /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 e61a04f7d..b4bb93a47 100644
--- 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(
-- 
2.39.5