X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0727d9054668ffca19e63567e7c33dc36b10ebea..530cc480bd3624cf4eed5f18f7f792a85067e631:/roles/rhaegal.rb diff --git a/roles/rhaegal.rb b/roles/rhaegal.rb index 0ca0618fb..a16c9e721 100644 --- a/roles/rhaegal.rb +++ b/roles/rhaegal.rb @@ -7,22 +7,6 @@ default_attributes( :mmiler => { :status => :administrator } } }, - :apt => { - :sources => ["postgresql"] - }, - :devices => { - :ssd_samsung => { - :comment => "Tune scheduler for SSD", - :type => "block", - :bus => "ata", - :serial => "Samsung_SSD_860_PRO_*", - :attrs => { - "queue/scheduler" => "noop", - "queue/nr_requests" => "256", - "queue/read_ahead_kb" => "2048" - } - } - }, :location => "Zagreb, Croatia", :munin => { :plugins => { @@ -44,57 +28,20 @@ default_attributes( }, :networking => { :interfaces => { - :external_ipv4 => { - :interface => "enp1s0f0", + :external => { + :interface => "eno1", :role => :external, - :family => :inet, - :address => "10.5.0.77", - :prefix => "16", - :gateway => "10.5.0.1", - :public_address => "161.53.248.77" - } - }, - :nameservers => [ - "10.5.0.7", - "8.8.8.8" - ] - }, - :postgresql => { - :versions => ["10"], - :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 - } - } - }, - :tile => { - :database => { - :cluster => "10/main", - :postgis => "2.4" - }, - :node_file => "/store/database/nodes", - :styles => { - :default => { - :tile_directories => [ - { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 } - ] + :inet => { + :address => "10.5.0.77", + :prefix => "16", + :gateway => "10.5.0.1", + :public_address => "161.53.248.77" + } } } } ) run_list( - "role[carnet]", - "role[tile]" + "role[carnet]" )