X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/22e1e601087eb94338baafd1adb440a68f481691..fc644b32403b63672bd1de6b9676efec559e5961:/roles/orm.rb?ds=sidebyside diff --git a/roles/orm.rb b/roles/orm.rb index ab2680130..5e4c83135 100644 --- a/roles/orm.rb +++ b/roles/orm.rb @@ -2,78 +2,30 @@ name "orm" description "Master role applied to orm" default_attributes( + :apt => { + :sources => ["postgresql"] + }, :devices => { - :ssdvol1tune => { - :comment => "Tune scheduler for SSD", - :type => "block", - :bus => "scsi", - :sas_address => "0x4433221107000000", - :attrs => { - "queue/scheduler" => "noop", - "queue/nr_requests" => "256" - } - }, - :ssdvol2tune => { + :ssd_samsung => { :comment => "Tune scheduler for SSD", :type => "block", - :bus => "scsi", - :sas_address => "0x4433221104000000", + :bus => "ata", + :serial => "Samsung_SSD_840_PRO_Series_*", :attrs => { "queue/scheduler" => "noop", - "queue/nr_requests" => "256" - } - }, - :arecavol1tune => { - :comment => "Tune scheduler for Areca", - :type => "block", - :bus => "scsi", - :model => "ARC-1680-VOL#000", - :attrs => { - "queue/scheduler" => "deadline", - "queue/nr_requests" => "512" + "queue/nr_requests" => "256", + "queue/read_ahead_kb" => "2048" } }, - :arecavol2tune => { + :arecavoltune => { :comment => "Tune scheduler for Areca", :type => "block", :bus => "scsi", - :model => "ARC-1680-VOL#001", + :serial => "2001b4d20*", :attrs => { "queue/scheduler" => "deadline", - "queue/nr_requests" => "512" - } - }, - :arecavol3tune => { - :comment => "Tune scheduler for Areca", - :type => "block", - :bus => "scsi", - :model => "ARC-1680-VOL#002", - :attrs => { - "queue/scheduler" => "deadline", - "queue/nr_requests" => "512" - } - } - }, - :munin => { - :plugins => { - :ipmi_fans => { - :Sys6 => { :graph => "no" }, - :Sys8 => { :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", + "queue/nr_requests" => "512", + "queue/read_ahead_kb" => "2048" } } }, @@ -94,7 +46,7 @@ default_attributes( } }, :postgresql => { - :versions => [ "9.1" ], + :versions => ["9.6"], :settings => { :defaults => { :shared_buffers => "8GB", @@ -106,25 +58,37 @@ 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 => { - :tile_directory => "/store/tiles", - :node_file => "/store/database/nodes" + :database => { + :cluster => "9.6/main", + :postgis => "2.3" + }, + :node_file => "/store/database/nodes", + :styles => { + :default => { + :tile_directories => [ + { :name => "/store/tiles/default-low", :min_zoom => 0, :max_zoom => 17 }, + { :name => "/store/tiles/default-high", :min_zoom => 18, :max_zoom => 19 } + ] + } + } } ) 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]" )