X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/86a0892bcf27888e4b28d1e3ce98dda42042c636..f66d8484209d0d6d1ade5bf7e0c9e292e49f80a9:/roles/ramoth.rb?ds=sidebyside diff --git a/roles/ramoth.rb b/roles/ramoth.rb index 21c75a339..5507fd3c3 100644 --- a/roles/ramoth.rb +++ b/roles/ramoth.rb @@ -2,15 +2,12 @@ name "ramoth" description "Master role applied to ramoth" default_attributes( - :db => { - :cluster => "9.1/main" - }, :devices => { :store_openstreetmap => { :comment => "RAID array mounted on /store/postgresql/openstreetmap", :type => "block", :bus => "scsi", - :serial => "3600605b0039483a017092ecbe862082a", + :serial => "3600605b00599aa401c02b4f53bf5c805", :attrs => { "queue/scheduler" => "deadline", "queue/nr_requests" => "975" @@ -43,36 +40,18 @@ default_attributes( :networking => { :interfaces => { :internal_ipv4 => { - :interface => "eth0", + :interface => "bond0", :role => :internal, :family => :inet, - :address => "146.179.159.170", - :hwaddress => "00:25:90:4b:05:9a" - } - } - }, - :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 + :address => "10.0.48.5", + :bond => { + :slaves => %w[enp7s0f0 enp7s0f1] + } } } } ) run_list( - "role[ic]", - "role[db-slave]" + "role[equinix-ams]" )