X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/29bdc84d134465bbf689f567984c1dd56f562eab..65c9e8faf5ce93135f34acfd6ec4f8ecd5f06f4f:/roles/odin.rb diff --git a/roles/odin.rb b/roles/odin.rb index aa5700e32..e31bc6923 100644 --- a/roles/odin.rb +++ b/roles/odin.rb @@ -4,48 +4,31 @@ description "Master role applied to odin" default_attributes( :networking => { :interfaces => { - :external_ipv4 => { + :internal_ipv4 => { :interface => "bond0", - :role => :external, + :role => :internal, :family => :inet, - :address => "130.225.254.123", - :prefix => "23", - :gateway => "130.225.254.97", + :address => "10.0.48.15", :bond => { - :mode => "802.3ad", - :miimon => "100", - :xmithashpolicy => "layer3+4", - :lacprate => "fast", :slaves => %w[eno1 eno2] } }, + :external_ipv4 => { + :interface => "bond0.2", + :role => :external, + :family => :inet, + :address => "130.117.76.15" + }, :external_ipv6 => { - :interface => "bond0", + :interface => "bond0.2", :role => :external, :family => :inet6, - :address => "2001:878:346::123", - :prefix => "64", - :gateway => "2001:878:346::97" + :address => "2001:978:2:2C::172:F" } } - }, - :squid => { - :cache_mem => "14000 MB", - :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80" - }, - :tilecache => { - :tile_parent => "aalborg.render.openstreetmap.org", - :tile_siblings => [ - "trogdor.openstreetmap.org", - "katie.openstreetmap.org", - "konqi.openstreetmap.org", - "ridgeback.openstreetmap.org", - "gorynych.openstreetmap.org" - ] } ) run_list( - "role[dotsrc]", - "role[tilecache]" + "role[equinix]" )