Ignore disconnected fans on ridgeback

[chef.git] / roles / ridgeback.rb

diff --git a/roles/ridgeback.rb b/roles/ridgeback.rb
index 73d32f9d1f33a9d9c8a5589718edc0558604e7dd..a680230427df53284366c62e51ef0e38fc6f3d86 100644 (file)
--- a/roles/ridgeback.rb
+++ b/roles/ridgeback.rb
@@ -2,6 +2,16 @@ name "ridgeback"
 description "Master role applied to ridgeback"
 
 default_attributes(
+  :munin => {
+    :plugins => {
+      :ipmi_fans => {
+        :Fan4 => { :graph => "no", :warning => "0:" },
+        :Fan5 => { :graph => "no", :warning => "0:" },
+        :Fan6 => { :graph => "no", :warning => "0:" },
+        :Fan7CPU1 => { :graph => "no", :warning => "0:" }
+      }
+    }
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -18,10 +28,10 @@ default_attributes(
     :md_tune => {
       :comment => "Tune the md sync performance so as not to kill system performance",
       :parameters => {
-        "block/md0/md/sync_speed_min" => "10",
-        "block/md0/md/sync_speed_max" => "10000",
-        "block/md1/md/sync_speed_min" => "10",
-        "block/md1/md/sync_speed_max" => "10000"
+        "block/md0/md/sync_speed_min" => "1",
+        "block/md0/md/sync_speed_max" => "100000",
+        "block/md1/md/sync_speed_min" => "1",
+        "block/md1/md/sync_speed_max" => "100000"
       }
     }
   },
@@ -34,8 +44,11 @@ default_attributes(
     :tile_siblings => [
       "fume.openstreetmap.org",
       "trogdor.openstreetmap.org",
-      "tabaluga.openstreetmap.org",
-      "nepomuk.openstreetmap.org"
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org",
+      "nepomuk.openstreetmap.org",
+      "gorynych.openstreetmap.org",
+      "simurgh.openstreetmap.org"
     ]
   },
   :munin => {