Update UCL machines for move to Slough

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index cffccad359582c1c64f34d3d7bac67cacc7d3b0e..14b4ee518588ff058120d77e67f5587851143c0f 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -14,7 +14,7 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.193"
+        :address => "193.60.236.10"
       }
     }
   },
@@ -26,7 +26,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl-slough]",
   "role[hp-g5]",
   "role[roundup]"
 )

diff --git a/roles/clifford.rb b/roles/clifford.rb
index 700cb6253e6525302d489beebc2c090e632555f2..6a760954936ffaa5fee9f9b9f7188b06bec47fab 100644 (file)
--- a/roles/clifford.rb
+++ b/roles/clifford.rb
@@ -14,14 +14,14 @@ default_attributes(
         :interface => "enp2s0f1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.194"
+        :address => "193.60.236.11"
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl-slough]",
   "role[hp-dl360-g6]",
   "role[forum]"
 )

diff --git a/roles/draco.rb b/roles/draco.rb
index 9bbaddd5c5f919b6518a73e84a8f4576b8ec9ba2..d5118704ea64a902dfe3c3384a0a01ef15b34410 100644 (file)
--- a/roles/draco.rb
+++ b/roles/draco.rb
@@ -14,7 +14,7 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.195"
+        :address => "193.60.236.12"
       }
     }
   },
@@ -30,6 +30,6 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl-slough]",
   "role[hp-g5]"
 )

diff --git a/roles/errol.rb b/roles/errol.rb
index 69b0d8db479d49642c4a87d764a88de7885b34ed..f51c7571a8fe791379dbd1898678c6d56d86a50e 100644 (file)
--- a/roles/errol.rb
+++ b/roles/errol.rb
@@ -36,14 +36,14 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.196"
+        :address => "193.60.236.13"
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl-slough]",
   "role[tyan-s7010]",
   "role[dev]"
 )

diff --git a/roles/eustace.rb b/roles/eustace.rb
index 0002388c35f7ee08a4ba980958250ab047b66401..60ee48007a151bbbcda268f4b1c1c3566b48e9e8 100644 (file)
--- a/roles/eustace.rb
+++ b/roles/eustace.rb
@@ -14,14 +14,14 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.197"
+        :address => "193.60.236.14"
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl-slough]",
   "role[hp-dl360-g6]",
   "role[piwik]"
 )

diff --git a/roles/grindtooth.rb b/roles/grindtooth.rb
index d6636294ce77660f3936854fc19477b32f8739be..1a04e42401b33da323be976e5dbb0324de2b80d7 100644 (file)
--- a/roles/grindtooth.rb
+++ b/roles/grindtooth.rb
@@ -14,14 +14,14 @@ default_attributes(
         :interface => "em2",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.199"
+        :address => "193.60.236.15"
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl-slough]",
   "role[hp-dl360-g6]",
   "role[taginfo]"
 )

diff --git a/roles/noquiklos.rb b/roles/noquiklos.rb
index 036255f4f8a90e6fa0b537b5928ce9ad715f6bf7..4e72f95b1c57a8005422d1aac912d9b8097b8ca4 100644 (file)
--- a/roles/noquiklos.rb
+++ b/roles/noquiklos.rb
@@ -14,14 +14,14 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.201"
+        :address => "193.60.236.16"
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl-slough]",
   "role[hp-dl360-g6]",
   "role[gps-tile]"
 )

diff --git a/roles/norbert.rb b/roles/norbert.rb
index a96812200bf7b62d861b377266a0d14349059aab..5bac68a14e865c6fd324270d9252f8ce2c88ab61 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -25,7 +25,7 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.202"
+        :address => "193.60.236.17"
       }
     }
   },
@@ -45,6 +45,6 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl-slough]",
   "role[hp-g5]"
 )

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 9f63dd0c0e3b295de01339bf8b2b069c6ae9aaac..975157fb4e79367afdb157d8e50e9249aff4dfd0 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -14,7 +14,7 @@ default_attributes(
         :interface => "em2",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.204"
+        :address => "193.60.236.18"
       }
     }
   },
@@ -52,6 +52,6 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl-slough]",
   "role[nominatim]"
 )

diff --git a/roles/ridley.rb b/roles/ridley.rb
index d3244ea8869be1793c9ca07bcbede563e2ef0710..00dbc1ab2f866b49682c91e1a346c03ccb923ab2 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -36,7 +36,7 @@ default_attributes(
         :interface => "eth0",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.205"
+        :address => "193.60.236.19"
       },
       :internal_ipv4 => {
         :interface => "eth1",
@@ -87,7 +87,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl-slough]",
   "role[hp-dl360-g6]",
   "role[gateway]",
   "role[foundation]",

diff --git a/roles/sarel.rb b/roles/sarel.rb
index 26f845b900dacad47c627ef70cb0edbc92527fb6..245fb0fedd0146777fd466d43d42e4130b0cc232 100644 (file)
--- a/roles/sarel.rb
+++ b/roles/sarel.rb
@@ -14,14 +14,14 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.206"
+        :address => "193.60.236.20"
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl-slough]",
   "role[hp-g5]",
   "role[yournavigation]"
 )

diff --git a/roles/ucl-slough.rb b/roles/ucl-slough.rb
new file mode 100644 (file)
index 0000000..03aaf1f
--- /dev/null
+++ b/roles/ucl-slough.rb
@@ -0,0 +1,33 @@
+name "ucl-slough"
+description "Role applied to all servers at UCL which are in Slough"
+
+default_attributes(
+  :networking => {
+    :roles => {
+      :internal => {
+        :inet => {
+          :prefix => "20",
+          :gateway => "10.0.0.3"
+        }
+      },
+      :external => {
+        :zone => "ucl",
+        :inet => {
+          :prefix => "24",
+          :gateway => "193.60.236.254"
+        }
+      }
+    }
+  }
+)
+
+override_attributes(
+  :networking => {
+    :nameservers => ["10.0.0.3", "8.8.8.8", "8.8.4.4"],
+    :search => ["ucl.openstreetmap.org", "openstreetmap.org"]
+  }
+)
+
+run_list(
+  "role[ucl]"
+)

diff --git a/roles/urmel.rb b/roles/urmel.rb
index ef6899a1caf4f9a025066050f1412992e25cb2ba..9b762e4e19d386d439292477b4e3d36b792970f8 100644 (file)
--- a/roles/urmel.rb
+++ b/roles/urmel.rb
@@ -14,14 +14,14 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.207"
+        :address => "193.60.236.21"
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl-slough]",
   "role[hp-dl360-g6]",
   "role[munin]"
 )

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index 42a29fc10fe8cc1d16bce42b09c440cae8a8fa63..498c3b64107b905d13cf4dceee147d2ec445a516 100644 (file)
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -70,7 +70,7 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.208"
+        :address => "193.60.236.22"
       }
     }
   },
@@ -110,7 +110,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl-slough]",
   "role[tyan-s7010]",
   "role[tile]"
 )

diff --git a/roles/zark.rb b/roles/zark.rb
index abee7f5e778affd4914dd37a1f6f329eadc2b60f..f61203872717a0dc30d4066115decb458cf3e403 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.45.209"
+        :address => "193.60.236.23"
       }
     }
   },
@@ -31,6 +31,6 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl-slough]",
   "role[owl]"
 )