Remove ubuntugis repos from draco

[chef.git] / roles / tyan-s7010.rb

diff --git a/roles/tyan-s7010.rb b/roles/tyan-s7010.rb
index 87e77e7fc7c72291d81bffb7cedc92b4f2f35bc6..97b5db3de81616c07f4465e216a5d9d72c457db6 100644 (file)
--- a/roles/tyan-s7010.rb
+++ b/roles/tyan-s7010.rb
@@ -3,6 +3,9 @@ description "Role applied to machines using the Tyan S710 motherboard"
 
 default_attributes(
   :hardware => {
+    :modules => [
+      "i2c_i801", "jc42", "w83793"
+    ],
     :sensors => {
       "jc42-*" => {
         :temps => { 
@@ -17,6 +20,8 @@ default_attributes(
           "in9" => { :min => 2.608, :max => 3.536 }
         },
         :fans => {
+          "fan1" => { :min => 1500 },
+          "fan2" => { :min => 1500 },
           "fan3" => { :ignore => true },
           "fan4" => { :ignore => true },
           "fan5" => { :ignore => true },
@@ -38,14 +43,14 @@ 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" }
+        :Sys3Front1 => { :graph => "no", :warning => "0:" },
+        :Sys4Front2 => { :graph => "no", :warning => "0:" },
+        :Sys5Rear1 => { :graph => "no", :warning => "0:" },
+        :Sys6 => { :graph => "no", :warning => "0:" },
+        :Sys7 => { :graph => "no", :warning => "0:" },
+        :Sys8 => { :graph => "no", :warning => "0:" },
+        :Sys9 => { :graph => "no", :warning => "0:" },
+        :Sys10 => { :graph => "no", :warning => "0:" }
       },
       :ipmi_temp => {
         :CPU0belowTmax => { :critical => "10:" },