From 9c69d3d41616820e83728ca063fbf7f62562d932 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 7 Dec 2016 08:36:44 +0000 Subject: [PATCH] Update UCL machines for move to Slough --- roles/ascalon.rb | 4 ++-- roles/clifford.rb | 4 ++-- roles/draco.rb | 4 ++-- roles/errol.rb | 4 ++-- roles/eustace.rb | 4 ++-- roles/grindtooth.rb | 4 ++-- roles/noquiklos.rb | 4 ++-- roles/norbert.rb | 4 ++-- roles/pummelzacken.rb | 4 ++-- roles/ridley.rb | 4 ++-- roles/sarel.rb | 4 ++-- roles/ucl-slough.rb | 33 +++++++++++++++++++++++++++++++++ roles/urmel.rb | 4 ++-- roles/yevaud.rb | 4 ++-- roles/zark.rb | 4 ++-- 15 files changed, 61 insertions(+), 28 deletions(-) create mode 100644 roles/ucl-slough.rb diff --git a/roles/ascalon.rb b/roles/ascalon.rb index cffccad35..14b4ee518 100644 --- 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 700cb6253..6a7609549 100644 --- 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 9bbaddd5c..d5118704e 100644 --- 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 69b0d8db4..f51c7571a 100644 --- 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 0002388c3..60ee48007 100644 --- 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 d6636294c..1a04e4240 100644 --- 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 036255f4f..4e72f95b1 100644 --- 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 a96812200..5bac68a14 100644 --- 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 9f63dd0c0..975157fb4 100644 --- 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 d3244ea88..00dbc1ab2 100644 --- 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 26f845b90..245fb0fed 100644 --- 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 index 000000000..03aaf1fb5 --- /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 ef6899a1c..9b762e4e1 100644 --- 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 42a29fc10..498c3b641 100644 --- 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 abee7f5e7..f61203872 100644 --- 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]" ) -- 2.43.2