X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9d5a6b906c34392324452ad8090a5ab8659d01bf..381a2ed6f20eb39bda2c2b60aac9931471d22bd4:/roles/ironbelly.rb diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb index f3494a4cb..91edefceb 100644 --- a/roles/ironbelly.rb +++ b/roles/ironbelly.rb @@ -39,38 +39,14 @@ default_attributes( :slaves => %w[eth0 eth1] } }, - :external_cogent => { - :interface => "bond0.2", - :role => :external, - :metric => 150, - :source_route_table => 100, - :inet => { - :address => "130.117.76.10", - :prefix => "27", - :gateway => "130.117.76.1" - }, - :inet6 => { - :address => "2001:978:2:2c::172:a", - :prefix => "64", - :gateway => "2001:978:2:2c::172:1", - :routes => { - "2001:470:1:b3b::/64" => { :type => "unreachable" } - } - } - }, :external => { :interface => "bond0.3", :role => :external, - :source_route_table => 150, :inet => { - :address => "184.104.179.138", - :prefix => "27", - :gateway => "184.104.179.129" + :address => "184.104.179.138" }, :inet6 => { - :address => "2001:470:1:fa1::a", - :prefix => "64", - :gateway => "2001:470:1:fa1::1" + :address => "2001:470:1:fa1::a" } } } @@ -102,10 +78,8 @@ default_attributes( :hosts_allow => [ "193.60.236.0/24", # ucl external "10.0.48.0/20", # amsterdam internal - "130.117.76.0/27", # amsterdam external (cogent) - "2001:978:2:2c::172:0/112", # amsterdam external (cogent) - "184.104.179.128/27", # amsterdam external (he) - "2001:470:1:fa1::/64", # amsterdam external (he) + "184.104.179.128/27", # amsterdam external + "2001:470:1:fa1::/64", # amsterdam external "10.0.64.0/20", # dublin internal "184.104.226.96/27", # dublin external "2001:470:1:b3b::/64", # dublin external