X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/45eedc13e8411e714184adfa419380f8472e3bf3..97402948037953908f5c66fe3295838d02b5310c:/roles/faffy.rb?ds=sidebyside diff --git a/roles/faffy.rb b/roles/faffy.rb index c7b8170d2..4a21fae61 100644 --- a/roles/faffy.rb +++ b/roles/faffy.rb @@ -4,11 +4,12 @@ description "Master role applied to faffy" default_attributes( :networking => { :interfaces => { - :internal_ipv4 => { + :internal => { :interface => "bond0", :role => :internal, - :family => :inet, - :address => "10.0.48.3", + :inet => { + :address => "10.0.48.3" + }, :bond => { :mode => "802.3ad", :lacprate => "fast", @@ -16,17 +17,22 @@ default_attributes( :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6] } }, - :external_ipv4 => { + :external => { :interface => "bond0.2", :role => :external, - :family => :inet, - :address => "130.117.76.3" - }, - :external_ipv6 => { - :interface => "bond0.2", - :role => :external, - :family => :inet6, - :address => "2001:978:2:2C::172:3" + :inet => { + :address => "130.117.76.3", + :prefix => "27", + :gateway => "130.117.76.1" + }, + :inet6 => { + :address => "2001:978:2:2c::172:3", + :prefix => "64", + :gateway => "2001:978:2:2c::172:1", + :routes => { + "2001:470:1:b3b::/64" => { :type => "unreachable" } + } + } } } }