X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2bfb0ef07fb64314f5c4ded641a8c280df9c1d0b..b79b8175ffe747fa42251d2a5679f90d889337dc:/roles/culebre.rb?ds=inline diff --git a/roles/culebre.rb b/roles/culebre.rb index dd29fe29b..4cdf87caf 100644 --- a/roles/culebre.rb +++ b/roles/culebre.rb @@ -4,11 +4,12 @@ description "Master role applied to culebre" default_attributes( :networking => { :interfaces => { - :internal_ipv4 => { + :internal => { :interface => "bond0", :role => :internal, - :family => :inet, - :address => "10.0.64.9", + :inet => { + :address => "10.0.64.9" + }, :bond => { :mode => "802.3ad", :lacprate => "fast", @@ -16,25 +17,21 @@ default_attributes( :slaves => %w[enp68s0f0 enp68s0f1 enp68s0f2 enp68s0f3] } }, - :external_ipv4 => { + :external => { :interface => "bond0.101", :role => :external, - :family => :inet, - :address => "184.104.226.105" - }, - :external_ipv6 => { - :interface => "bond0.101", - :role => :external, - :family => :inet6, - :address => "2001:470:1:b3b::9" + :inet => { + :address => "184.104.226.105" + }, + :inet6 => { + :address => "2001:470:1:b3b::9" + } } } }, :postgresql => { :settings => { :defaults => { - :shared_buffers => "8GB", - :maintenance_work_mem => "7144MB", :effective_cache_size => "16GB" } } @@ -50,7 +47,7 @@ default_attributes( }, :tile => { :database => { - :cluster => "14/main", + :cluster => "16/main", :postgis => "3" }, :mapnik => "3.1",