From 21059505903e7ee9a5e6488882cc0e4bf613bda6 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 15 Jan 2021 16:59:15 +0000 Subject: [PATCH] Reconfigure balerion as a render server --- roles/balerion.rb | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/roles/balerion.rb b/roles/balerion.rb index f74a4ee03..e1ab5929b 100644 --- a/roles/balerion.rb +++ b/roles/balerion.rb @@ -2,9 +2,6 @@ name "balerion" description "Master role applied to balerion" default_attributes( - :hardware => { - :shm_size => "36g" - }, :networking => { :interfaces => { :external_ipv4 => { @@ -20,23 +17,41 @@ default_attributes( } } }, - :squid => { - :version => 4, - :cache_mem => "32768 MB", - :cache_dir => [ - "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996", - "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092", - "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284", - "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144" - ] + :postgresql => { + :settings => { + :defaults => { + :shared_buffers => "8GB", + :maintenance_work_mem => "7144MB", + :effective_cache_size => "16GB" + } + } + }, + :sysctl => { + :postgres => { + :comment => "Increase shared memory for postgres", + :parameters => { + "kernel.shmmax" => 9 * 1024 * 1024 * 1024, + "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096 + } + } }, - :tilecache => { - :tile_parent => "melbourne.render.openstreetmap.org" + :tile => { + :database => { + :cluster => "12/main", + :postgis => "3" + }, + :styles => { + :default => { + :tile_directories => [ + { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 } + ] + } + } } ) run_list( "role[aarnet]", "role[geodns]", - "role[tilecache]" + "role[tile]" ) -- 2.43.2