X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/38afacb3e9601854ac020f45cc4414ce21e3bc7f..fece7ed198752ba5b22de9d45a51694a65997a08:/roles/naga.rb diff --git a/roles/naga.rb b/roles/naga.rb index f69f91d53..b12795a97 100644 --- a/roles/naga.rb +++ b/roles/naga.rb @@ -4,11 +4,12 @@ description "Master role applied to naga" default_attributes( :networking => { :interfaces => { - :internal_ipv4 => { + :internal => { :interface => "bond0", :role => :internal, - :family => :inet, - :address => "10.0.64.8", + :inet => { + :address => "10.0.64.8" + }, :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.104" - }, - :external_ipv6 => { - :interface => "bond0.101", - :role => :external, - :family => :inet6, - :address => "2001:470:1:b3b::8" + :inet => { + :address => "184.104.226.104" + }, + :inet6 => { + :address => "2001:470:1:b3b::8" + } } } } @@ -38,5 +37,13 @@ run_list( "role[subversion]", "role[trac]", "role[irc]", - "role[blogs]" + "role[blogs]", + "role[switch2osm]", + "recipe[foundation::mastodon]", + "recipe[foundation::owg]", + "recipe[foundation::welcome]", + "recipe[stateofthemap::container]", + "recipe[hot]", + "recipe[ideditor]", + "recipe[dmca]" )