From: Tom Hughes Date: Fri, 4 Jul 2014 10:00:51 +0000 (+0100) Subject: Update IP addresses etc for move to Wolfson House X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c97ab416b812405837e803dd3a4a42c3ef134c1f Update IP addresses etc for move to Wolfson House --- diff --git a/roles/ascalon.rb b/roles/ascalon.rb index 7f5e2bd71..f453ced38 100644 --- 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 143cc8be1..fbef667cc 100644 --- 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 1384b7a6d..770d8fc96 100644 --- 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 74bc999a8..0b547d610 100644 --- 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 26b2b2dfc..3a4c6fc7f 100644 --- 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 2d1808708..4ab350da0 100644 --- 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 21dde9b5f..c86b55c2e 100644 --- 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 b25d3e0ed..b13469623 100644 --- 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 8d62e6076..4894d2e28 100644 --- 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 f23800800..b860ce55e 100644 --- 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 7bb870f71..73fb31c05 100644 --- 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 83329ca59..9e0de5764 100644 --- 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 08093d90d..fef91998d 100644 --- 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 daef981c0..c2a667a4c 100644 --- 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 882621d0d..71beb15ac 100644 --- 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 97c561bd7..bf8038cd5 100644 --- 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 22095f596..2c7339539 100644 --- 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 701e78c7b..abee7f5e7 100644 --- 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]" )