X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1035dfa5a67bfe0063e942637bf0868aa0637a3c..63694bbb3acd7dc65ed20ab2ab7a1aa0c2cea4b2:/roles/katla.rb diff --git a/roles/katla.rb b/roles/katla.rb index 4be8aae1d..194b139b6 100644 --- a/roles/katla.rb +++ b/roles/katla.rb @@ -2,8 +2,11 @@ name "katla" description "Master role applied to katla" default_attributes( + :apt => { + :sources => ["postgresql"] + }, :db => { - :cluster => "9.1/main" + :cluster => "9.5/main" }, :devices => { :store_slow => { @@ -13,7 +16,8 @@ default_attributes( :serial => "3600605b005a0609019290f178be8de77", :attrs => { "queue/scheduler" => "deadline", - "queue/nr_requests" => "975" + "queue/nr_requests" => "975", + "queue/rq_affinity" => "2" } }, :store_fast => { @@ -23,18 +27,39 @@ default_attributes( :serial => "3600605b005a0726019d062ae23b426fd", :attrs => { "queue/scheduler" => "deadline", - "queue/nr_requests" => "975" + "queue/nr_requests" => "975", + "queue/rq_affinity" => "2" + } + }, + :store_ssd_1 => { + :comment => "First disk of RAID array mounted on /store/arrays/ssd", + :type => "block", + :bus => "ata", + :serial => "INTEL_SSDSC2BA400G3_BTTV3141041E400HGN", + :attrs => { + "queue/scheduler" => "noop" + } + }, + :store_ssd_2 => { + :comment => "Second disk of RAID array mounted on /store/arrays/ssd", + :type => "block", + :bus => "ata", + :serial => "INTEL_SSDSC2BA400G3_BTTV3141044Q400HGN", + :attrs => { + "queue/scheduler" => "noop" } } }, :networking => { :interfaces => { :internal_ipv4 => { - :interface => "eth0", + :interface => "bond0", :role => :internal, :family => :inet, - :address => "146.179.159.173", - :hwaddress => "00:25:90:94:91:00" + :address => "10.0.32.40", + :bond => { + :slaves => %w[eth0 eth1] + } } } }, @@ -49,6 +74,13 @@ default_attributes( } }, :sysctl => { + :ipv6_autoconf => { + :comment => "Disable IPv6 auto-configuration on internal interface", + :parameters => { + "net.ipv6.conf.bond0.autoconf" => "0", + "net.ipv6.conf.bond0.accept_ra" => "0" + } + }, :postgres => { :comment => "Increase shared memory for postgres", :parameters => { @@ -57,9 +89,10 @@ default_attributes( } } } -); +) run_list( - "role[ic]", - "role[db-slave]" + "role[bytemark]", + "role[db-master]", + "role[db-backup]" )