X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ba1ebf773fd90cb0480e6f79ef6ba2001f039c51..f66d8484209d0d6d1ade5bf7e0c9e292e49f80a9:/roles/ramoth.rb?ds=inline diff --git a/roles/ramoth.rb b/roles/ramoth.rb index 9f75e9f43..5507fd3c3 100644 --- a/roles/ramoth.rb +++ b/roles/ramoth.rb @@ -2,12 +2,6 @@ name "ramoth" description "Master role applied to ramoth" default_attributes( - :apt => { - :sources => ["postgresql"] - }, - :db => { - :cluster => "9.5/main" - }, :devices => { :store_openstreetmap => { :comment => "RAID array mounted on /store/postgresql/openstreetmap", @@ -51,33 +45,13 @@ default_attributes( :family => :inet, :address => "10.0.48.5", :bond => { - :slaves => %w[eth0 eth1] + :slaves => %w[enp7s0f0 enp7s0f1] } } } - }, - :postgresql => { - :settings => { - :defaults => { - :shared_buffers => "64GB", - :work_mem => "64MB", - :maintenance_work_mem => "1GB", - :effective_cache_size => "180GB" - } - } - }, - :sysctl => { - :postgres => { - :comment => "Increase shared memory for postgres", - :parameters => { - "kernel.shmmax" => 66 * 1024 * 1024 * 1024, - "kernel.shmall" => 66 * 1024 * 1024 * 1024 / 4096 - } - } } ) run_list( - "role[equinix]", - "role[db-slave]" + "role[equinix-ams]" )