X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4378e24ae196a1ff6af4f9994dcc54425498f7ba..f732c900124f75d6311b54c007a072b205b13b1b:/roles/odin.rb diff --git a/roles/odin.rb b/roles/odin.rb index 238e403ae..9a19c5b2d 100644 --- a/roles/odin.rb +++ b/roles/odin.rb @@ -4,34 +4,34 @@ description "Master role applied to odin" default_attributes( :networking => { :interfaces => { - :internal_ipv4 => { + :internal => { :interface => "bond0", :role => :internal, - :family => :inet, - :address => "10.0.48.15", + :inet => { + :address => "10.0.48.15" + }, :bond => { + :mode => "802.3ad", + :lacprate => "fast", + :xmithashpolicy => "layer3+4", :slaves => %w[eno1 eno2] } }, - :external_ipv4 => { - :interface => "bond0.2", + :external => { + :interface => "bond0.3", :role => :external, - :family => :inet, - :address => "130.117.76.15" - }, - :external_ipv6 => { - :interface => "bond0.2", - :role => :external, - :family => :inet6, - :address => "2001:978:2:2C::172:F" + :inet => { + :address => "184.104.179.143" + }, + :inet6 => { + :address => "2001:470:1:fa1::f" + } } } }, :postgresql => { :settings => { :defaults => { - :shared_buffers => "8GB", - :maintenance_work_mem => "7144MB", :effective_cache_size => "16GB" } } @@ -47,9 +47,10 @@ default_attributes( }, :tile => { :database => { - :cluster => "12/main", + :cluster => "16/main", :postgis => "3" }, + :mapnik => "3.1", :styles => { :default => { :tile_directories => [ @@ -61,6 +62,6 @@ default_attributes( ) run_list( - "role[equinix]", + "role[equinix-ams]", "role[tile]" )