X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d524df24e5f3fe2c7eba94a7ad2d36a1756a6087..262347df604997a1cef52df74ffdb687e5a6c22a:/roles/orm.rb diff --git a/roles/orm.rb b/roles/orm.rb index ebc81821f..bc73e1d55 100644 --- a/roles/orm.rb +++ b/roles/orm.rb @@ -2,6 +2,9 @@ name "orm" description "Master role applied to orm" default_attributes( + :apt => { + :sources => ["postgresql"] + }, :devices => { :ssd_samsung => { :comment => "Tune scheduler for SSD", @@ -26,38 +29,6 @@ default_attributes( } } }, - :munin => { - :plugins => { - :ipmi_fans => { - :Sys3 => { :graph => "no" }, - :Sys4 => { :graph => "no" }, - :Sys5 => { :graph => "no" }, - :Sys6 => { :graph => "no" }, - :Sys7 => { :graph => "no" }, - :Sys8 => { :graph => "no" }, - :Sys9 => { :graph => "no" }, - :Sys10 => { :graph => "no" } - }, - :sensors_fan => { - :fan3 => { :graph => "no" }, - :fan4 => { :graph => "no" }, - :fan5 => { :graph => "no" }, - :fan6 => { :graph => "no" }, - :fan7 => { :graph => "no" }, - :fan8 => { :graph => "no" }, - :fan9 => { :graph => "no" }, - :fan10 => { :graph => "no" }, - :fan11 => { :graph => "no" }, - :fan12 => { :graph => "no" } - }, - :sensors_volt => { - :contacts => "null", - :volt6 => { - :warning => "2.992:3.536" - } - } - } - }, :networking => { :interfaces => { :external_ipv4 => { @@ -75,7 +46,7 @@ default_attributes( } }, :postgresql => { - :versions => [ "9.1" ], + :versions => ["9.5"], :settings => { :defaults => { :shared_buffers => "8GB", @@ -87,13 +58,16 @@ default_attributes( :sysctl => { :postgres => { :comment => "Increase shared memory for postgres", - :parameters => { + :parameters => { "kernel.shmmax" => 9 * 1024 * 1024 * 1024, "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096 } } }, :tile => { + :database => { + :cluster => "9.5/main" + }, :node_file => "/store/database/nodes", :styles => { :default => { @@ -108,11 +82,12 @@ default_attributes( override_attributes( :networking => { - :nameservers => [ "8.8.8.8", "8.8.4.4" ] + :nameservers => ["8.8.8.8", "8.8.4.4"] } ) run_list( "role[ic]", + "role[tyan-s7010]", "role[tile]" )