From: Tom Hughes Date: Wed, 24 May 2023 14:47:45 +0000 (+0100) Subject: Add he.net addresses to remaining Amsterdam machines X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/495102aad33ab69c269205369e7f1807d13c7a2f Add he.net addresses to remaining Amsterdam machines --- diff --git a/roles/dribble.rb b/roles/dribble.rb index bef432204..cc992c589 100644 --- a/roles/dribble.rb +++ b/roles/dribble.rb @@ -17,9 +17,10 @@ default_attributes( :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6] } }, - :external => { + :external_cogent => { :interface => "bond0.2", :role => :external, + :source_route_table => 100, :inet => { :address => "130.117.76.4", :prefix => "27", @@ -33,6 +34,22 @@ default_attributes( "2001:470:1:b3b::/64" => { :type => "unreachable" } } } + }, + :external => { + :interface => "bond0.3", + :role => :external, + :metric => 150, + :source_route_table => 150, + :inet => { + :address => "184.104.179.132", + :prefix => "27", + :gateway => "184.104.179.129" + }, + :inet6 => { + :address => "2001:470:1:fa1::4", + :prefix => "64", + :gateway => "2001:470:1:fa1::1" + } } } }, diff --git a/roles/dulcy.rb b/roles/dulcy.rb index c7dda68de..0f73d7cc4 100644 --- a/roles/dulcy.rb +++ b/roles/dulcy.rb @@ -17,9 +17,10 @@ default_attributes( :slaves => %w[ens18f0 ens18f1] } }, - :external => { + :external_cogent => { :interface => "bond0.2", :role => :external, + :source_route_table => 100, :inet => { :address => "130.117.76.9", :prefix => "27", @@ -33,6 +34,22 @@ default_attributes( "2001:470:1:b3b::/64" => { :type => "unreachable" } } } + }, + :external => { + :interface => "bond0.3", + :role => :external, + :metric => 150, + :source_route_table => 150, + :inet => { + :address => "184.104.179.137", + :prefix => "27", + :gateway => "184.104.179.129" + }, + :inet6 => { + :address => "2001:470:1:fa1::9", + :prefix => "64", + :gateway => "2001:470:1:fa1::1" + } } } }, diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb index 016ec8200..0c89b199d 100644 --- a/roles/ironbelly.rb +++ b/roles/ironbelly.rb @@ -39,9 +39,10 @@ default_attributes( :slaves => %w[eth0 eth1] } }, - :external => { + :external_cogent => { :interface => "bond0.2", :role => :external, + :source_route_table => 100, :inet => { :address => "130.117.76.10", :prefix => "27", @@ -55,6 +56,22 @@ default_attributes( "2001:470:1:b3b::/64" => { :type => "unreachable" } } } + }, + :external => { + :interface => "bond0.3", + :role => :external, + :metric => 150, + :source_route_table => 150, + :inet => { + :address => "184.104.179.138", + :prefix => "27", + :gateway => "184.104.179.129" + }, + :inet6 => { + :address => "2001:470:1:fa1::a", + :prefix => "64", + :gateway => "2001:470:1:fa1::1" + } } } }, diff --git a/roles/norbert.rb b/roles/norbert.rb index b492a9286..66140ee60 100644 --- a/roles/norbert.rb +++ b/roles/norbert.rb @@ -17,9 +17,10 @@ default_attributes( :slaves => %w[enp25s0f0 enp25s0f1] } }, - :external => { + :external_cogent => { :interface => "bond0.2", :role => :external, + :source_route_table => 100, :inet => { :address => "130.117.76.17", :prefix => "27", @@ -33,6 +34,22 @@ default_attributes( "2001:470:1:b3b::/64" => { :type => "unreachable" } } } + }, + :external => { + :interface => "bond0.3", + :role => :external, + :metric => 150, + :source_route_table => 150, + :inet => { + :address => "184.104.179.139", + :prefix => "27", + :gateway => "184.104.179.129" + }, + :inet6 => { + :address => "2001:470:1:fa1::11", + :prefix => "64", + :gateway => "2001:470:1:fa1::1" + } } } }, diff --git a/roles/odin.rb b/roles/odin.rb index 6d29b734c..b835c456d 100644 --- a/roles/odin.rb +++ b/roles/odin.rb @@ -17,9 +17,10 @@ default_attributes( :slaves => %w[eno1 eno2] } }, - :external => { + :external_cogent => { :interface => "bond0.2", :role => :external, + :source_route_table => 100, :inet => { :address => "130.117.76.15", :prefix => "27", @@ -33,6 +34,22 @@ default_attributes( "2001:470:1:b3b::/64" => { :type => "unreachable" } } } + }, + :external => { + :interface => "bond0.3", + :role => :external, + :metric => 150, + :source_route_table => 150, + :inet => { + :address => "184.104.179.143", + :prefix => "27", + :gateway => "184.104.179.129" + }, + :inet6 => { + :address => "2001:470:1:fa1::f", + :prefix => "64", + :gateway => "2001:470:1:fa1::1" + } } } }, diff --git a/roles/spike-06.rb b/roles/spike-06.rb index 73a3802b1..42345259e 100644 --- a/roles/spike-06.rb +++ b/roles/spike-06.rb @@ -17,9 +17,10 @@ default_attributes( :slaves => %w[eno1 eno2] } }, - :external => { + :external_cogent => { :interface => "bond0.2", :role => :external, + :source_route_table => 100, :inet => { :address => "130.117.76.11", :prefix => "27", @@ -33,6 +34,22 @@ default_attributes( "2001:470:1:b3b::/64" => { :type => "unreachable" } } } + }, + :external => { + :interface => "bond0.3", + :role => :external, + :metric => 150, + :source_route_table => 150, + :inet => { + :address => "184.104.179.139", + :prefix => "27", + :gateway => "184.104.179.129" + }, + :inet6 => { + :address => "2001:470:1:fa1::b", + :prefix => "64", + :gateway => "2001:470:1:fa1::1" + } } } } diff --git a/roles/spike-07.rb b/roles/spike-07.rb index b6a5fc0da..ad9461e9a 100644 --- a/roles/spike-07.rb +++ b/roles/spike-07.rb @@ -17,9 +17,10 @@ default_attributes( :slaves => %w[eno1 eno2] } }, - :external => { + :external_cogent => { :interface => "bond0.2", :role => :external, + :source_route_table => 100, :inet => { :address => "130.117.76.12", :prefix => "27", @@ -33,6 +34,22 @@ default_attributes( "2001:470:1:b3b::/64" => { :type => "unreachable" } } } + }, + :external => { + :interface => "bond0.3", + :role => :external, + :metric => 150, + :source_route_table => 150, + :inet => { + :address => "184.104.179.140", + :prefix => "27", + :gateway => "184.104.179.129" + }, + :inet6 => { + :address => "2001:470:1:fa1::c", + :prefix => "64", + :gateway => "2001:470:1:fa1::1" + } } } } diff --git a/roles/spike-08.rb b/roles/spike-08.rb index c65e0c4c7..e73190fc4 100644 --- a/roles/spike-08.rb +++ b/roles/spike-08.rb @@ -17,9 +17,10 @@ default_attributes( :slaves => %w[eno1 eno2] } }, - :external => { + :external_cogent => { :interface => "bond0.2", :role => :external, + :source_route_table => 100, :inet => { :address => "130.117.76.13", :prefix => "27", @@ -33,6 +34,22 @@ default_attributes( "2001:470:1:b3b::/64" => { :type => "unreachable" } } } + }, + :external => { + :interface => "bond0.3", + :role => :external, + :metric => 150, + :source_route_table => 150, + :inet => { + :address => "184.104.179.141", + :prefix => "27", + :gateway => "184.104.179.129" + }, + :inet6 => { + :address => "2001:470:1:fa1::d", + :prefix => "64", + :gateway => "2001:470:1:fa1::1" + } } } } diff --git a/roles/vhagar.rb b/roles/vhagar.rb index 75ca73bf0..df6ad79c3 100644 --- a/roles/vhagar.rb +++ b/roles/vhagar.rb @@ -17,9 +17,10 @@ default_attributes( :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6] } }, - :external => { + :external_cogent => { :interface => "bond0.2", :role => :external, + :source_route_table => 100, :inet => { :address => "130.117.76.5", :prefix => "27", @@ -33,6 +34,22 @@ default_attributes( "2001:470:1:b3b::/64" => { :type => "unreachable" } } } + }, + :external => { + :interface => "bond0.3", + :role => :external, + :metric => 150, + :source_route_table => 150, + :inet => { + :address => "184.104.179.133", + :prefix => "27", + :gateway => "184.104.179.129" + }, + :inet6 => { + :address => "2001:470:1:fa1::5", + :prefix => "64", + :gateway => "2001:470:1:fa1::1" + } } } },