X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5b10b5e8a474a2c3e96082728f89c74e80153e44..1e5fc43d68e8cc7756db87a9ba3867c9b216b0ac:/roles/necrosan.rb diff --git a/roles/necrosan.rb b/roles/necrosan.rb index 02392d05c..c113f451a 100644 --- a/roles/necrosan.rb +++ b/roles/necrosan.rb @@ -4,64 +4,39 @@ description "Master role applied to necrosan" default_attributes( :networking => { :interfaces => { - :external_ipv4 => { + :external => { :interface => "bond0", - :mtu => "9000", + :mtu => 9000, :role => :external, - :family => :inet, - :address => "45.85.134.91", - :prefix => "31", - :gateway => "45.85.134.90", + :inet => { + :address => "45.85.134.91", + :prefix => "31", + :gateway => "45.85.134.90" + }, + :inet6 => { + :address => "2a05:46c0:100:1004:ffff:ffff:ffff:ffff", + :prefix => "64", + :gateway => "2a05:46c0:100:1004::" + }, :bond => { :slaves => %w[eno1 eno2], :mode => "802.3ad", :lacprate => "fast" } - }, - :external_ipv6 => { - :interface => "bond0", - :role => :external, - :family => :inet6, - :address => "2a05:46c0:100:1004:ffff:ffff:ffff:ffff", - :prefix => "64", - :gateway => "2a05:46c0:100:1004::" - } - } - }, - :postgresql => { - :settings => { - :defaults => { - :shared_buffers => "8GB", - :maintenance_work_mem => "7144MB", - :effective_cache_size => "16GB" } } }, - :sysctl => { - :postgres => { - :comment => "Increase shared memory for postgres", + :sysfs => { + :hdd_tune => { + :comment => "Tune the queue for improved performance", :parameters => { - "kernel.shmmax" => 9 * 1024 * 1024 * 1024, - "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096 - } - } - }, - :tile => { - :database => { - :cluster => "12/main", - :postgis => "3" - }, - :styles => { - :default => { - :tile_directories => [ - { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 } - ] + "block/sda/queue/nr_requests" => "975", + "block/sdb/queue/rotational" => "0" } } } ) run_list( - "role[appliwave]", - "role[tile]" + "role[appliwave]" )