Ignore more disconnected fans

[chef.git] / roles / yevaud.rb

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index a0b9218966dbe89a98fbe56184bb001085f65b37..299005da214c0e81cd1082ffa34d1bd2dc82f6c2 100644 (file)
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -39,8 +39,9 @@ default_attributes(
       :bus => "ata",
       :serial => "INTEL_SSDSA2CW600G3_CVPR111401HP600FGN",
       :attrs => {
-        "queue/scheduler" => "deadline",
-        "queue/nr_requests" => "512"
+        "queue/scheduler" => "noop",
+        "queue/nr_requests" => "512",
+        "queue/read_ahead_kb" => "2048"
       }
     }
   },
@@ -59,10 +60,18 @@ default_attributes(
         }
       },
       :ipmi_fans => {
-        :contacts => "null",
+        :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 => {
-        :contacts => "null",
+        :CPU0belowTmax => { :critical => "10:" },
+        :CPU1belowTmax => { :critical => "10:" }
       },
       :sensors_fan => {
         :contacts => "null"
@@ -87,7 +96,7 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.104"
+        :address => "128.40.45.208"
       }
     }
   },
@@ -124,6 +133,6 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-internal]",
+  "role[ucl-wolfson]",
   "role[tile]"
 )