Update IP addresses etc for move to Wolfson House

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 7f5e2bd710cf323c6adb7d2ebe4c15781f978976..f453ced3872f66294d2d9b7ae9c9f999b0d8f975 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -4,6 +4,12 @@ description "Master role applied to ascalon"
 default_attributes(
   :networking => {
     :interfaces => {
+      :internal_ipv4 => {
+        :interface => "eth0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.0.18"
+      },
       :external_ipv4 => {
         :interface => "eth1",
         :role => :external,

diff --git a/roles/clifford.rb b/roles/clifford.rb
index 143cc8be1e5be9c79fe7fc129a65e50ce459d898..fbef667cc2f10625e5632d4660512d5408a86483 100644 (file)
--- a/roles/clifford.rb
+++ b/roles/clifford.rb
@@ -14,13 +14,13 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.98"
+        :address => "128.40.45.194"
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-wates]",
+  "role[ucl-wolfson]",
   "role[forum]"
 )

diff --git a/roles/draco.rb b/roles/draco.rb
index 1384b7a6d1a08e3c9e7f6f94b63b614918800282..770d8fc968a0e929652ee0655eb3e55461698a04 100644 (file)
--- a/roles/draco.rb
+++ b/roles/draco.rb
@@ -17,7 +17,7 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.95"
+        :address => "128.40.45.195"
       }
     }
   },
@@ -33,5 +33,5 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wates]"
+  "role[ucl-wolfson]"
 )

diff --git a/roles/errol.rb b/roles/errol.rb
index 74bc999a8d7b47bcee1bdb4be9c7c8634ddd3a8d..0b547d610636e366e88615b7aa0454d8d4cc2120 100644 (file)
--- a/roles/errol.rb
+++ b/roles/errol.rb
@@ -53,13 +53,13 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.103"
+        :address => "128.40.45.196"
       }
     }
   }
 );
 
 run_list(
-  "role[ucl-wates]",
+  "role[ucl-wolfson]",
   "role[dev]"
 )

diff --git a/roles/eustace.rb b/roles/eustace.rb
index 26b2b2dfcf31c9ca30c7332f1f60d335f3a5c76b..3a4c6fc7fc27dd3820c7a873834eb99394be45d3 100644 (file)
--- a/roles/eustace.rb
+++ b/roles/eustace.rb
@@ -14,13 +14,13 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.101"
+        :address => "128.40.45.197"
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-wates]",
+  "role[ucl-wolfson]",
   "role[piwik]"
 )

diff --git a/roles/faffy.rb b/roles/faffy.rb
index 2d1808708ef8ea9fe2afa926dacdec9218c4bba8..4ab350da069528e0a9e07442473f50d0971fe401 100644 (file)
--- a/roles/faffy.rb
+++ b/roles/faffy.rb
@@ -14,7 +14,7 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.108"
+        :address => "128.40.45.198"
       }
     }
   },
@@ -57,6 +57,6 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wates]",
+  "role[ucl-wolfson]",
   "recipe[rsyncd]"
 )

diff --git a/roles/grindtooth.rb b/roles/grindtooth.rb
index 21dde9b5ffbaba1a200839b9ba0edf10f45b72d8..c86b55c2e943b711bbd78a7db25a660f88209ae7 100644 (file)
--- a/roles/grindtooth.rb
+++ b/roles/grindtooth.rb
@@ -14,13 +14,13 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.100"
+        :address => "128.40.45.199"
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-wates]",
+  "role[ucl-wolfson]",
   "role[taginfo]"
 )

diff --git a/roles/idris.rb b/roles/idris.rb
index b25d3e0edd80da494046415042795d34e3d24692..b13469623f593b811d9839bad4d21a6407879184 100644 (file)
--- a/roles/idris.rb
+++ b/roles/idris.rb
@@ -9,11 +9,17 @@ default_attributes(
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.4"
+      },
+      :external_ipv4 => {
+        :interface => "eth1",
+        :role => :external,
+        :family => :inet,
+        :address => "128.40.45.200"
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-wates]"
+  "role[ucl-wolfson]"
 )

diff --git a/roles/noquiklos.rb b/roles/noquiklos.rb
index 8d62e6076a0cc50f1c5d30de55952805b18c8ee6..4894d2e28836e903635a7533fa4092aef8a6c130 100644 (file)
--- a/roles/noquiklos.rb
+++ b/roles/noquiklos.rb
@@ -14,13 +14,13 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.99"
+        :address => "128.40.45.201"
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-wates]",
+  "role[ucl-wolfson]",
   "role[gps-tile]"
 )

diff --git a/roles/norbert.rb b/roles/norbert.rb
index f23800800616e7942cf3f3d3a28f7a239b381d41..b860ce55ea87754a327219ae3e60520241302252 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -20,6 +20,12 @@ default_attributes(
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.5"
+      },
+      :external_ipv4 => {
+        :interface => "eth1",
+        :role => :external,
+        :family => :inet,
+        :address => "128.40.45.202"
       }
     }
   },
@@ -39,5 +45,5 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wates]"
+  "role[ucl-wolfson]"
 )

diff --git a/roles/poldi.rb b/roles/poldi.rb
index 7bb870f71e0848a0a5a36aaebd12177134707572..73fb31c058c6881bc823e5c4218fbb6388a39828 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -49,7 +49,7 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.106"
+        :address => "128.40.45.203"
       }
     }
   },
@@ -97,6 +97,6 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wates]",
+  "role[ucl-wolfson]",
   "role[nominatim]"
 )

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 83329ca59ca6980879dae554141e7c67bd02b0f6..9e0de57649aac8a496cd0e60c9819858d5e8f24d 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -14,7 +14,7 @@ default_attributes(
         :interface => "p5p2",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.105"
+        :address => "128.40.45.204"
       }
     }
   },
@@ -54,6 +54,6 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wates]",
+  "role[ucl-wolfson]",
   "role[nominatim]"
 )

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 08093d90dfabb3fc1006f25de9dde35dae88327c..fef91998d0270171b975692462ffba958a9db019 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -32,7 +32,7 @@ default_attributes(
         :interface => "eth0",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.102"
+        :address => "128.40.45.205"
       },
       :internal_ipv4 => {
         :interface => "eth1",
@@ -75,7 +75,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wates]",
+  "role[ucl-wolfson]",
   "role[gateway]",
   "role[foundation]",
   "role[stateofthemap]",

diff --git a/roles/sarel.rb b/roles/sarel.rb
index daef981c0a0a2dd044ef220a39f5c7834199877a..c2a667a4c8bef20eb6b0f1410bfe29ee6ec9891e 100644 (file)
--- a/roles/sarel.rb
+++ b/roles/sarel.rb
@@ -14,13 +14,13 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.97"
+        :address => "128.40.45.206"
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-wates]",
+  "role[ucl-wolfson]",
   "role[yournavigation]"
 )

diff --git a/roles/ucl-wolfson.rb b/roles/ucl-wolfson.rb
index 882621d0d7f77f6ac9c2c34f5aee0f6e94396d94..71beb15aca36e6f7b2fae9e9c0dcff234c3f4337 100644 (file)
--- a/roles/ucl-wolfson.rb
+++ b/roles/ucl-wolfson.rb
@@ -4,6 +4,12 @@ description "Role applied to all servers at UCL which are in Wolfson House"
 default_attributes(
   :networking => {
     :roles => {
+      :internal => {
+        :inet => {
+          :prefix => "20",
+          :gateway => "10.0.0.3"
+        }
+      },
       :external => {
         :zone => "ucl",
         :inet => {
@@ -17,8 +23,8 @@ default_attributes(
 
 override_attributes(
   :networking => {
-    :nameservers => [ "8.8.8.8", "8.8.4.4" ],
-    :search => [ "openstreetmap.org" ]
+    :nameservers => [ "10.0.0.3", "8.8.8.8", "8.8.4.4" ],
+    :search => [ "ucl.openstreetmap.org", "openstreetmap.org" ]
   }
 )
 

diff --git a/roles/urmel.rb b/roles/urmel.rb
index 97c561bd763349737fee99b0d102003163e3a32b..bf8038cd5d30877d0f8cda3d0b07e3e2a4f7e658 100644 (file)
--- a/roles/urmel.rb
+++ b/roles/urmel.rb
@@ -14,13 +14,13 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.96"
+        :address => "128.40.45.2076"
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-wates]",
+  "role[ucl-wolfson]",
   "role[munin]"
 )

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index 22095f596c5e1a64b1bc4638a1d0a4e07ea65f48..2c7339539693e9ce55076e770669336d4f7b396e 100644 (file)
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -88,7 +88,7 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.104"
+        :address => "128.40.45.208"
       }
     }
   },
@@ -125,6 +125,6 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wates]",
+  "role[ucl-wolfson]",
   "role[tile]"
 )

diff --git a/roles/zark.rb b/roles/zark.rb
index 701e78c7b61664eb0c3d1eb69adf140e5e16740e..abee7f5e778affd4914dd37a1f6f329eadc2b60f 100644 (file)
--- a/roles/zark.rb
+++ b/roles/zark.rb
@@ -14,7 +14,7 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.107"
+        :address => "128.40.45.209"
       }
     }
   },
@@ -31,6 +31,6 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wates]",
+  "role[ucl-wolfson]",
   "role[owl]"
 )