X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a7e0fa87d07dca81657f9f5627df8b5daee79a65..b9ea56c8f85e93cc5a3abdbf4467c01da820529f:/roles/smaug.rb diff --git a/roles/smaug.rb b/roles/smaug.rb index 3adb0f0ed..547143452 100644 --- a/roles/smaug.rb +++ b/roles/smaug.rb @@ -2,76 +2,37 @@ name "smaug" description "Master role applied to smaug" default_attributes( - :accounts => { - :users => { - :gravitystorm => { :status => :user } - } - }, - :apt => { - :sources => ["brightbox-ruby-ng"] - }, - :db => { - :cluster => "9.1/main" - }, - :munin => { - :plugins => { - :ipmi_fans => { - :Fan4 => { :graph => "no" }, - :Fan7CPU1 => { :graph => "no" }, - :Fan8CPU2 => { :graph => "no" } - }, - :sensors_volt => { - :contacts => "null", - :volt10 => { - :warning => "3.11:3.50", - :critical => "2.98:3.63" - } - } - } - }, :networking => { :interfaces => { :internal_ipv4 => { - :interface => "eth0", + :interface => "bond0", :role => :internal, :family => :inet, - :address => "146.179.159.168" - } - } - }, - :postgresql => { - :settings => { - :defaults => { - :shared_buffers => "16GB", - :work_mem => "32MB", - :maintenance_work_mem => "512MB", - :effective_cache_size => "45GB" - } - } - }, - :sysctl => { - :postgres => { - :comment => "Increase shared memory for postgres", - :parameters => { - "kernel.shmmax" => 17 * 1024 * 1024 * 1024, - "kernel.shmall" => 17 * 1024 * 1024 * 1024 / 4096 - } - } - }, - :sysfs => { - :hdd_tune => { - :comment => "Tune the queue for improved performance", - :parameters => { - "block/sda/queue/nr_requests" => "512", - "block/sdb/queue/nr_requests" => "512", - "block/sda/queue/scheduler" => "noop", - "block/sdb/queue/scheduler" => "noop" + :address => "10.0.64.14", + :bond => { + :mode => "802.3ad", + :lacprate => "fast", + :xmithashpolicy => "layer3+4", + :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6] + } + }, + :external_ipv4 => { + :interface => "bond0.101", + :role => :external, + :family => :inet, + :address => "184.104.226.110" + }, + :external_ipv6 => { + :interface => "bond0.101", + :role => :external, + :family => :inet6, + :address => "2001:470:1:b3b::e" } } } ) run_list( - "role[ucl]", - "role[db-slave]" + "role[equinix-dub]", + "role[matomo]" )