X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c99d15f97b7d0f55ef253e5faa5e273fac6035d4..ac45d147fd8486807bec749ce92f8244d7964edc:/roles/balerion.rb diff --git a/roles/balerion.rb b/roles/balerion.rb index aa8f9977d..60e6bbcb0 100644 --- a/roles/balerion.rb +++ b/roles/balerion.rb @@ -4,34 +4,54 @@ description "Master role applied to balerion" default_attributes( :networking => { :interfaces => { - :external_ipv4 => { + :external => { :interface => "bond0", :role => :external, - :family => :inet, - :address => "138.44.68.134", - :prefix => "30", - :gateway => "138.44.68.133", + :inet => { + :address => "138.44.68.134", + :prefix => "30", + :gateway => "138.44.68.133" + }, :bond => { - :slaves => %w[ens14f0 ens14f1] + :slaves => %w[ens14f0np0 ens14f1np1] } } } }, - :squid => { - :cache_mem => "32000 MB", - :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80" + :postgresql => { + :settings => { + :defaults => { + :effective_cache_size => "16GB" + } + } }, - :tilecache => { - :tile_parent => "melbourne.render.openstreetmap.org", - :tile_siblings => [ - "waima.openstreetmap.org", - "tuatara.openstreetmap.org", - "longma.openstreetmap.org" - ] + :sysctl => { + :postgres => { + :comment => "Increase shared memory for postgres", + :parameters => { + "kernel.shmmax" => 9 * 1024 * 1024 * 1024, + "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096 + } + } + }, + :tile => { + :database => { + :cluster => "16/main", + :postgis => "3" + }, + :mapnik => "3.1", + :styles => { + :default => { + :tile_directories => [ + { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 } + ] + } + } } ) run_list( "role[aarnet]", - "role[tilecache]" + "role[geodns]", + "role[tile]" )