X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4b7aea286bd82cf0c86e92319742c31bad356b8d..9c080effa5bab5aa01d3c911e32e938123a29787:/roles/ramoth.rb?ds=sidebyside diff --git a/roles/ramoth.rb b/roles/ramoth.rb index 896d99c6d..5507fd3c3 100644 --- a/roles/ramoth.rb +++ b/roles/ramoth.rb @@ -2,9 +2,6 @@ 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", @@ -28,9 +25,6 @@ default_attributes( } }, :hardware => { - :grub => { - :cmdline => %w(ghes.disable=1) - }, :watchdog => "w83627hf_wdt" }, :munin => { @@ -46,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]" )