From: Tom Hughes Date: Thu, 8 Dec 2016 10:42:53 +0000 (+0000) Subject: Drop support for old UCL locations X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/4995554e7b535b58f0f730eca6e6df9082aad083?ds=sidebyside;hp=9ed7006bdad8ba036017b19025b3710f3f4c6716 Drop support for old UCL locations --- diff --git a/roles/ascalon.rb b/roles/ascalon.rb index 7725f4907..243484ac1 100644 --- a/roles/ascalon.rb +++ b/roles/ascalon.rb @@ -26,7 +26,7 @@ default_attributes( ) run_list( - "role[ucl-slough]", + "role[ucl]", "role[hp-g5]", "role[roundup]" ) diff --git a/roles/clifford.rb b/roles/clifford.rb index 373b307ad..78fc7a93e 100644 --- a/roles/clifford.rb +++ b/roles/clifford.rb @@ -21,7 +21,7 @@ default_attributes( ) run_list( - "role[ucl-slough]", + "role[ucl]", "role[hp-dl360-g6]", "role[forum]" ) diff --git a/roles/draco.rb b/roles/draco.rb index 1b63f9459..dc28adf56 100644 --- a/roles/draco.rb +++ b/roles/draco.rb @@ -30,6 +30,6 @@ default_attributes( ) run_list( - "role[ucl-slough]", + "role[ucl]", "role[hp-g5]" ) diff --git a/roles/errol.rb b/roles/errol.rb index 59b5af6c3..e4db08b80 100644 --- a/roles/errol.rb +++ b/roles/errol.rb @@ -43,7 +43,7 @@ default_attributes( ) run_list( - "role[ucl-slough]", + "role[ucl]", "role[tyan-s7010]", "role[dev]" ) diff --git a/roles/eustace.rb b/roles/eustace.rb index c5b4186a2..4aa2fdd31 100644 --- a/roles/eustace.rb +++ b/roles/eustace.rb @@ -21,7 +21,7 @@ default_attributes( ) run_list( - "role[ucl-slough]", + "role[ucl]", "role[hp-dl360-g6]", "role[piwik]" ) diff --git a/roles/grindtooth.rb b/roles/grindtooth.rb index 66233d4b9..f24618d0e 100644 --- a/roles/grindtooth.rb +++ b/roles/grindtooth.rb @@ -21,7 +21,7 @@ default_attributes( ) run_list( - "role[ucl-slough]", + "role[ucl]", "role[hp-dl360-g6]", "role[taginfo]" ) diff --git a/roles/noquiklos.rb b/roles/noquiklos.rb index e532e2616..f42afa81b 100644 --- a/roles/noquiklos.rb +++ b/roles/noquiklos.rb @@ -21,7 +21,7 @@ default_attributes( ) run_list( - "role[ucl-slough]", + "role[ucl]", "role[hp-dl360-g6]", "role[gps-tile]" ) diff --git a/roles/norbert.rb b/roles/norbert.rb index 084037f56..4aab4eede 100644 --- a/roles/norbert.rb +++ b/roles/norbert.rb @@ -45,6 +45,6 @@ default_attributes( ) run_list( - "role[ucl-slough]", + "role[ucl]", "role[hp-g5]" ) diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb index 492bd2ea7..f5a573d47 100644 --- a/roles/pummelzacken.rb +++ b/roles/pummelzacken.rb @@ -52,6 +52,6 @@ default_attributes( ) run_list( - "role[ucl-slough]", + "role[ucl]", "role[nominatim]" ) diff --git a/roles/ridley.rb b/roles/ridley.rb index d87bd4b1d..7250ce893 100644 --- a/roles/ridley.rb +++ b/roles/ridley.rb @@ -87,7 +87,7 @@ default_attributes( ) run_list( - "role[ucl-slough]", + "role[ucl]", "role[hp-dl360-g6]", "role[gateway]", "role[foundation]", diff --git a/roles/sarel.rb b/roles/sarel.rb index 0d7832b53..aab567bd8 100644 --- a/roles/sarel.rb +++ b/roles/sarel.rb @@ -21,7 +21,7 @@ default_attributes( ) run_list( - "role[ucl-slough]", + "role[ucl]", "role[hp-g5]", "role[yournavigation]" ) diff --git a/roles/ucl-slough.rb b/roles/ucl-slough.rb deleted file mode 100644 index c0b42f751..000000000 --- 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 index bba547e0f..000000000 --- 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 index 208185a37..000000000 --- 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 2dd44ee70..f3a030595 100644 --- a/roles/ucl.rb +++ b/roles/ucl.rb @@ -2,15 +2,33 @@ name "ucl" 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( + :networking => { + :nameservers => ["10.0.0.3", "8.8.8.8", "8.8.4.4"], + :search => ["ucl.openstreetmap.org", "openstreetmap.org"] + }, :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 3ed9fb789..dba68ec66 100644 --- a/roles/urmel.rb +++ b/roles/urmel.rb @@ -21,7 +21,7 @@ default_attributes( ) run_list( - "role[ucl-slough]", + "role[ucl]", "role[hp-dl360-g6]", "role[munin]" ) diff --git a/roles/yevaud.rb b/roles/yevaud.rb index 012077183..3d259f674 100644 --- a/roles/yevaud.rb +++ b/roles/yevaud.rb @@ -116,7 +116,7 @@ default_attributes( ) run_list( - "role[ucl-slough]", + "role[ucl]", "role[tyan-s7010]", "role[tile]" ) diff --git a/roles/zark.rb b/roles/zark.rb index 8a6fc9748..45a6de4d2 100644 --- a/roles/zark.rb +++ b/roles/zark.rb @@ -31,6 +31,6 @@ default_attributes( ) run_list( - "role[ucl-slough]", + "role[ucl]", "role[owl]" )