From 97402948037953908f5c66fe3295838d02b5310c Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 23 May 2023 22:27:36 +0100 Subject: [PATCH] Push external network config in Amsterdam down to the hosts --- roles/dribble.rb | 11 +++++++++-- roles/dulcy.rb | 11 +++++++++-- roles/equinix-ams.rb | 13 +------------ roles/faffy.rb | 11 +++++++++-- roles/ironbelly.rb | 11 +++++++++-- roles/norbert.rb | 11 +++++++++-- roles/odin.rb | 11 +++++++++-- roles/spike-06.rb | 11 +++++++++-- roles/spike-07.rb | 11 +++++++++-- roles/spike-08.rb | 11 +++++++++-- roles/vhagar.rb | 11 +++++++++-- 11 files changed, 91 insertions(+), 32 deletions(-) diff --git a/roles/dribble.rb b/roles/dribble.rb index f40e9dcd8..bef432204 100644 --- a/roles/dribble.rb +++ b/roles/dribble.rb @@ -21,10 +21,17 @@ default_attributes( :interface => "bond0.2", :role => :external, :inet => { - :address => "130.117.76.4" + :address => "130.117.76.4", + :prefix => "27", + :gateway => "130.117.76.1" }, :inet6 => { - :address => "2001:978:2:2c::172:4" + :address => "2001:978:2:2c::172:4", + :prefix => "64", + :gateway => "2001:978:2:2c::172:1", + :routes => { + "2001:470:1:b3b::/64" => { :type => "unreachable" } + } } } } diff --git a/roles/dulcy.rb b/roles/dulcy.rb index 5c067440a..c7dda68de 100644 --- a/roles/dulcy.rb +++ b/roles/dulcy.rb @@ -21,10 +21,17 @@ default_attributes( :interface => "bond0.2", :role => :external, :inet => { - :address => "130.117.76.9" + :address => "130.117.76.9", + :prefix => "27", + :gateway => "130.117.76.1" }, :inet6 => { - :address => "2001:978:2:2c::172:9" + :address => "2001:978:2:2c::172:9", + :prefix => "64", + :gateway => "2001:978:2:2c::172:1", + :routes => { + "2001:470:1:b3b::/64" => { :type => "unreachable" } + } } } } diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb index fafecd478..1715e9d47 100644 --- a/roles/equinix-ams.rb +++ b/roles/equinix-ams.rb @@ -14,18 +14,7 @@ default_attributes( } }, :external => { - :zone => "ams", - :inet => { - :prefix => "27", - :gateway => "130.117.76.1" - }, - :inet6 => { - :prefix => "64", - :gateway => "2001:978:2:2c::172:1", - :routes => { - "2001:470:1:b3b::/64" => { :type => "unreachable" } - } - } + :zone => "ams" } } }, diff --git a/roles/faffy.rb b/roles/faffy.rb index 9f0a83552..4a21fae61 100644 --- a/roles/faffy.rb +++ b/roles/faffy.rb @@ -21,10 +21,17 @@ default_attributes( :interface => "bond0.2", :role => :external, :inet => { - :address => "130.117.76.3" + :address => "130.117.76.3", + :prefix => "27", + :gateway => "130.117.76.1" }, :inet6 => { - :address => "2001:978:2:2c::172:3" + :address => "2001:978:2:2c::172:3", + :prefix => "64", + :gateway => "2001:978:2:2c::172:1", + :routes => { + "2001:470:1:b3b::/64" => { :type => "unreachable" } + } } } } diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb index aef5e90ae..016ec8200 100644 --- a/roles/ironbelly.rb +++ b/roles/ironbelly.rb @@ -43,10 +43,17 @@ default_attributes( :interface => "bond0.2", :role => :external, :inet => { - :address => "130.117.76.10" + :address => "130.117.76.10", + :prefix => "27", + :gateway => "130.117.76.1" }, :inet6 => { - :address => "2001:978:2:2c::172:a" + :address => "2001:978:2:2c::172:a", + :prefix => "64", + :gateway => "2001:978:2:2c::172:1", + :routes => { + "2001:470:1:b3b::/64" => { :type => "unreachable" } + } } } } diff --git a/roles/norbert.rb b/roles/norbert.rb index 9985bbda3..b492a9286 100644 --- a/roles/norbert.rb +++ b/roles/norbert.rb @@ -21,10 +21,17 @@ default_attributes( :interface => "bond0.2", :role => :external, :inet => { - :address => "130.117.76.17" + :address => "130.117.76.17", + :prefix => "27", + :gateway => "130.117.76.1" }, :inet6 => { - :address => "2001:978:2:2c::172:11" + :address => "2001:978:2:2c::172:11", + :prefix => "64", + :gateway => "2001:978:2:2c::172:1", + :routes => { + "2001:470:1:b3b::/64" => { :type => "unreachable" } + } } } } diff --git a/roles/odin.rb b/roles/odin.rb index a7f836e18..6d29b734c 100644 --- a/roles/odin.rb +++ b/roles/odin.rb @@ -21,10 +21,17 @@ default_attributes( :interface => "bond0.2", :role => :external, :inet => { - :address => "130.117.76.15" + :address => "130.117.76.15", + :prefix => "27", + :gateway => "130.117.76.1" }, :inet6 => { - :address => "2001:978:2:2c::172:f" + :address => "2001:978:2:2c::172:f", + :prefix => "64", + :gateway => "2001:978:2:2c::172:1", + :routes => { + "2001:470:1:b3b::/64" => { :type => "unreachable" } + } } } } diff --git a/roles/spike-06.rb b/roles/spike-06.rb index 2e93f41a0..73a3802b1 100644 --- a/roles/spike-06.rb +++ b/roles/spike-06.rb @@ -21,10 +21,17 @@ default_attributes( :interface => "bond0.2", :role => :external, :inet => { - :address => "130.117.76.11" + :address => "130.117.76.11", + :prefix => "27", + :gateway => "130.117.76.1" }, :inet6 => { - :address => "2001:978:2:2c::172:b" + :address => "2001:978:2:2c::172:b", + :prefix => "64", + :gateway => "2001:978:2:2c::172:1", + :routes => { + "2001:470:1:b3b::/64" => { :type => "unreachable" } + } } } } diff --git a/roles/spike-07.rb b/roles/spike-07.rb index dc2a449d3..b6a5fc0da 100644 --- a/roles/spike-07.rb +++ b/roles/spike-07.rb @@ -21,10 +21,17 @@ default_attributes( :interface => "bond0.2", :role => :external, :inet => { - :address => "130.117.76.12" + :address => "130.117.76.12", + :prefix => "27", + :gateway => "130.117.76.1" }, :inet6 => { - :address => "2001:978:2:2c::172:c" + :address => "2001:978:2:2c::172:c", + :prefix => "64", + :gateway => "2001:978:2:2c::172:1", + :routes => { + "2001:470:1:b3b::/64" => { :type => "unreachable" } + } } } } diff --git a/roles/spike-08.rb b/roles/spike-08.rb index 836c0f41b..c65e0c4c7 100644 --- a/roles/spike-08.rb +++ b/roles/spike-08.rb @@ -21,10 +21,17 @@ default_attributes( :interface => "bond0.2", :role => :external, :inet => { - :address => "130.117.76.13" + :address => "130.117.76.13", + :prefix => "27", + :gateway => "130.117.76.1" }, :inet6 => { - :address => "2001:978:2:2c::172:d" + :address => "2001:978:2:2c::172:d", + :prefix => "64", + :gateway => "2001:978:2:2c::172:1", + :routes => { + "2001:470:1:b3b::/64" => { :type => "unreachable" } + } } } } diff --git a/roles/vhagar.rb b/roles/vhagar.rb index 304b212db..75ca73bf0 100644 --- a/roles/vhagar.rb +++ b/roles/vhagar.rb @@ -21,10 +21,17 @@ default_attributes( :interface => "bond0.2", :role => :external, :inet => { - :address => "130.117.76.5" + :address => "130.117.76.5", + :prefix => "27", + :gateway => "130.117.76.1" }, :inet6 => { - :address => "2001:978:2:2c::172:5" + :address => "2001:978:2:2c::172:5", + :prefix => "64", + :gateway => "2001:978:2:2c::172:1", + :routes => { + "2001:470:1:b3b::/64" => { :type => "unreachable" } + } } } } -- 2.39.5