Ignore more disconnected fans

[chef.git] / roles / poldi.rb

diff --git a/roles/poldi.rb b/roles/poldi.rb
index 77626ed3893b64b6833890d73221bc6a0e1b18d2..46ba3963eaade5865a09a6fab3d50a4f24f2fc23 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -2,6 +2,9 @@ name "poldi"
 description "Master role applied to poldi"
 
 default_attributes(
+  :apt => {
+    :sources => [ "ubuntugis-stable", "ubuntugis-unstable" ]
+  },
   :devices => {
     :areca_ld_tune => {
       :comment => "RAID arrays on areca",
@@ -29,7 +32,7 @@ default_attributes(
     :md_tune => {
       :comment => "Tune the md sync performance so as not to kill system performance",
       :parameters => {
-        "block/md0/md/sync_speed_min" => "100",
+        "block/md0/md/sync_speed_min" => "1",
         "block/md0/md/sync_speed_max" => "100000"
       }
     }
@@ -46,7 +49,7 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.106"
+        :address => "128.40.45.203"
       }
     }
   },
@@ -71,7 +74,7 @@ default_attributes(
     :fpm_pools => {
         :www => {
             :pm => "dynamic",
-            :max_children => "70"
+            :max_children => "60"
         },
         :bulk => {
             :pm => "static",
@@ -81,6 +84,20 @@ default_attributes(
   },
   :munin => {
     :plugins => {
+      :ipmi_fans => {
+        :Sys3Front1 => { :graph => "no" },
+        :Sys4Front2 => { :graph => "no" },
+        :Sys5Rear1 => { :graph => "no" },
+        :Sys6 => { :graph => "no" },
+        :Sys7 => { :graph => "no" },
+        :Sys8 => { :graph => "no" },
+        :Sys9 => { :graph => "no" },
+        :Sys10 => { :graph => "no" }
+      },
+      :ipmi_temp => {
+        :CPU0belowTmax => { :critical => "10:" },
+        :CPU1belowTmax => { :critical => "10:" }
+      },
       :sensors_volt => {
         :volt6 => {
           :warning => "2.992:3.536"
@@ -94,6 +111,6 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-internal]",
+  "role[ucl-wolfson]",
   "role[nominatim]"
 )