X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a4d6799f3084f32868038c3b9771f67691312e4..ce776f3b88283b954673a88e814c15e7002b6a73:/roles/grisu.rb diff --git a/roles/grisu.rb b/roles/grisu.rb index 595b5a0f6..17b0aaa55 100644 --- a/roles/grisu.rb +++ b/roles/grisu.rb @@ -4,66 +4,34 @@ description "Master role applied to grisu" default_attributes( :networking => { :interfaces => { - :internal_ipv4 => { + :internal => { :interface => "bond0", :role => :internal, - :family => :inet, - :address => "10.0.32.20", + :inet => { + :address => "10.0.64.17" + }, :bond => { - :slaves => %w[em1 em2] + :mode => "802.3ad", + :lacprate => "fast", + :xmithashpolicy => "layer3+4", + :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6] } }, - :external_ipv4 => { - :interface => "bond0.214", + :external => { + :interface => "bond0.101", :role => :external, - :family => :inet, - :address => "89.16.162.20" - }, - :external_ipv6 => { - :interface => "bond0.214", - :role => :external, - :family => :inet6, - :address => "2001:41c9:2:d6::20" - } - } - }, - :openvpn => { - :address => "10.0.16.5", - :tunnels => { - :ic2bm => { - :port => "1194", - :mode => "server", - :peer => { - :host => "ironbelly.openstreetmap.org" - } - }, - :aws2bm => { - :port => "1195", - :mode => "server", - :peer => { - :host => "fafnir.openstreetmap.org" - } - }, - :ucl2bm => { - :port => "1196", - :mode => "server", - :peer => { - :host => "ridley.openstreetmap.org" + :inet => { + :address => "184.104.226.113" + }, + :inet6 => { + :address => "2001:470:1:b3b::11" } } } - }, - :planet => { - :replication => "disabled" } ) run_list( - "role[bytemark]", - "role[hp-dl180-g6]", - "role[gateway]", - "role[web-storage]", - "role[backup]", - "role[planet]", - "recipe[openvpn]" + "role[equinix-dub]", + "role[overpass-query]" )