Drop support for old UCL locations

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 7725f4907570646a5141d560a178cb294c02baa1..243484ac18aa436c0ea478abd920af24acd92d2f 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -26,7 +26,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
+  "role[ucl]",

   "role[hp-g5]",
   "role[roundup]"
 )
   "role[hp-g5]",
   "role[roundup]"
 )

diff --git a/roles/clifford.rb b/roles/clifford.rb
index 373b307adea61f8644ebfd97e05fc0e21099ed43..78fc7a93ee0a7b1723add0655d8c27c3b54a35a7 100644 (file)
--- a/roles/clifford.rb
+++ b/roles/clifford.rb
@@ -21,7 +21,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
+  "role[ucl]",

   "role[hp-dl360-g6]",
   "role[forum]"
 )
   "role[hp-dl360-g6]",
   "role[forum]"
 )

diff --git a/roles/draco.rb b/roles/draco.rb
index 1b63f9459275264baac8028e396f6f6236b7f047..dc28adf567738305f74190306875332347eb7c7c 100644 (file)
--- a/roles/draco.rb
+++ b/roles/draco.rb
@@ -30,6 +30,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
+  "role[ucl]",

   "role[hp-g5]"
 )
   "role[hp-g5]"
 )

diff --git a/roles/errol.rb b/roles/errol.rb
index 59b5af6c37b8b42b38311fe8b054e7e0fb4d5ee7..e4db08b80ebef30e6fc62935f230639e9e9974ca 100644 (file)
--- a/roles/errol.rb
+++ b/roles/errol.rb
@@ -43,7 +43,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
+  "role[ucl]",

   "role[tyan-s7010]",
   "role[dev]"
 )
   "role[tyan-s7010]",
   "role[dev]"
 )

diff --git a/roles/eustace.rb b/roles/eustace.rb
index c5b4186a23d477fe21dba8d259941678141e4692..4aa2fdd31e80d0399775fc98663a51ac805a869d 100644 (file)
--- a/roles/eustace.rb
+++ b/roles/eustace.rb
@@ -21,7 +21,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
+  "role[ucl]",

   "role[hp-dl360-g6]",
   "role[piwik]"
 )
   "role[hp-dl360-g6]",
   "role[piwik]"
 )

diff --git a/roles/grindtooth.rb b/roles/grindtooth.rb
index 66233d4b97526e0863dcbd8e05442c8781204239..f24618d0edce0e36a9291c461e7cf18fbfa12353 100644 (file)
--- a/roles/grindtooth.rb
+++ b/roles/grindtooth.rb
@@ -21,7 +21,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
+  "role[ucl]",

   "role[hp-dl360-g6]",
   "role[taginfo]"
 )
   "role[hp-dl360-g6]",
   "role[taginfo]"
 )

diff --git a/roles/noquiklos.rb b/roles/noquiklos.rb
index e532e261607de44d2b705027423e750aaa27cd7f..f42afa81b7b662a270af7af28323a335c3fbf751 100644 (file)
--- a/roles/noquiklos.rb
+++ b/roles/noquiklos.rb
@@ -21,7 +21,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
+  "role[ucl]",

   "role[hp-dl360-g6]",
   "role[gps-tile]"
 )
   "role[hp-dl360-g6]",
   "role[gps-tile]"
 )

diff --git a/roles/norbert.rb b/roles/norbert.rb
index 084037f5643f24afb12b94ca47c3bd9704d1fdae..4aab4eedef91bba450d918fd1aca526ce73ebdee 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -45,6 +45,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
+  "role[ucl]",

   "role[hp-g5]"
 )
   "role[hp-g5]"
 )

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 492bd2ea739caebfa483a00243ac3002ad5ce3da..f5a573d47d01e952b31893b7b511065c387d56f1 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -52,6 +52,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
+  "role[ucl]",

   "role[nominatim]"
 )
   "role[nominatim]"
 )

diff --git a/roles/ridley.rb b/roles/ridley.rb
index d87bd4b1d1a790841aaf441d3a51ae9846a2dde5..7250ce893c72039cc4b74d3331bc10d83813d5b3 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -87,7 +87,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
+  "role[ucl]",

   "role[hp-dl360-g6]",
   "role[gateway]",
   "role[foundation]",
   "role[hp-dl360-g6]",
   "role[gateway]",
   "role[foundation]",

diff --git a/roles/sarel.rb b/roles/sarel.rb
index 0d7832b537418907eee4e5bf1833c03eac6f7b81..aab567bd87a9b810109843eba9c7c2cc5a7f52f1 100644 (file)
--- a/roles/sarel.rb
+++ b/roles/sarel.rb
@@ -21,7 +21,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
+  "role[ucl]",

   "role[hp-g5]",
   "role[yournavigation]"
 )
   "role[hp-g5]",
   "role[yournavigation]"
 )

diff --git a/roles/ucl-slough.rb b/roles/ucl-slough.rb
deleted file mode 100644 (file)
index c0b42f7..0000000
--- a/roles/ucl-slough.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-name "ucl-slough"
-description "Role applied to all servers at UCL which are in Slough"
-
-default_attributes(
-  :bind => {
-    :forwarders => ["8.8.8.8", "8.8.4.4"]
-  },
-  :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/ucl-wates.rb b/roles/ucl-wates.rb
deleted file mode 100644 (file)
index bba547e..0000000
--- a/roles/ucl-wates.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-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"
-        }
-      }
-    }
-  },
-  :sysctl => {
-    :sack => {
-      :comment => "Disable SACK as the UCL firewall breaks it",
-      :parameters => {
-        "net.ipv4.tcp_sack" => "0"
-      }
-    }
-  }
-)
-
-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/ucl-wolfson.rb b/roles/ucl-wolfson.rb
deleted file mode 100644 (file)
index 208185a..0000000
--- a/roles/ucl-wolfson.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-name "ucl-wolfson"
-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 => {
-          :prefix => "27",
-          :gateway => "128.40.45.222"
-        }
-      }
-    }
-  }
-)
-
-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/ucl.rb b/roles/ucl.rb
index 2dd44ee70d741166cc08181046523a06a58ec477..f3a0305950a45f574c118c520ec9957c79690d0c 100644 (file)
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -2,15 +2,33 @@ name "ucl"
 description "Role applied to all servers at UCL"
 
 default_attributes(
 description "Role applied to all servers at UCL"
 
 default_attributes(

-  :bind => {
-    :forwarders => ["144.82.100.1", "144.82.100.41"]
-  },
-  :location => "London, England"
+  :location => "Slough, England",
+  :networking => {
+    :roles => {
+      :internal => {
+        :inet => {
+          :prefix => "20",
+          :gateway => "10.0.0.3"
+        }
+      },
+      :external => {
+        :zone => "ucl",
+        :inet => {
+          :prefix => "24",
+          :gateway => "193.60.236.254"
+        }
+      }
+    }
+  }

 )
 
 override_attributes(
 )
 
 override_attributes(

+  :networking => {
+    :nameservers => ["10.0.0.3", "8.8.8.8", "8.8.4.4"],
+    :search => ["ucl.openstreetmap.org", "openstreetmap.org"]
+  },

   :ntp => {
   :ntp => {

-    :servers => ["ntp1.ucl.ac.uk", "ntp2.ucl.ac.uk"]
+    :servers => ["0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org"]

   }
 )
 
   }
 )
 

diff --git a/roles/urmel.rb b/roles/urmel.rb
index 3ed9fb7897460f6418e9e923eaf89174b312837e..dba68ec664c5bf6dec2a1cf4c0d36de5d0cd4436 100644 (file)
--- a/roles/urmel.rb
+++ b/roles/urmel.rb
@@ -21,7 +21,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
+  "role[ucl]",

   "role[hp-dl360-g6]",
   "role[munin]"
 )
   "role[hp-dl360-g6]",
   "role[munin]"
 )

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index 012077183db357e29340aa9d6d069e4e37d27648..3d259f6743b14594b60e9ef684c89588bd8711eb 100644 (file)
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -116,7 +116,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
+  "role[ucl]",

   "role[tyan-s7010]",
   "role[tile]"
 )
   "role[tyan-s7010]",
   "role[tile]"
 )

diff --git a/roles/zark.rb b/roles/zark.rb
index 8a6fc9748ea47716926695d4300b45c01cb14fd6..45a6de4d28a6d4cb3e16e72ead8509a35325a988 100644 (file)
--- a/roles/zark.rb
+++ b/roles/zark.rb
@@ -31,6 +31,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
+  "role[ucl]",

   "role[owl]"
 )
   "role[owl]"
 )