X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2bfb0ef07fb64314f5c4ded641a8c280df9c1d0b..1d1f22afe24f2656cd8ca5717482ebebaebffb02:/roles/konqi.rb diff --git a/roles/konqi.rb b/roles/konqi.rb index 735f8c1ad..b23841de2 100644 --- a/roles/konqi.rb +++ b/roles/konqi.rb @@ -4,11 +4,12 @@ description "Master role applied to konqi" default_attributes( :networking => { :interfaces => { - :internal_ipv4 => { + :internal => { :interface => "bond0", :role => :internal, - :family => :inet, - :address => "10.0.64.7", + :inet => { + :address => "10.0.64.7" + }, :bond => { :mode => "802.3ad", :lacprate => "fast", @@ -16,17 +17,15 @@ default_attributes( :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50] } }, - :external_ipv4 => { + :external => { :interface => "bond0.101", :role => :external, - :family => :inet, - :address => "184.104.226.103" - }, - :external_ipv6 => { - :interface => "bond0.101", - :role => :external, - :family => :inet6, - :address => "2001:470:1:b3b::7" + :inet => { + :address => "184.104.226.103" + }, + :inet6 => { + :address => "2001:470:1:b3b::7" + } } } } @@ -34,5 +33,6 @@ default_attributes( run_list( "role[equinix-dub]", - "role[hp-g9]" + "role[hp-g9]", + "role[wiki]" )