Don't reject on an error from zen.spamhaus.org

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

diff --git a/roles/tyan-s7010.rb b/roles/tyan-s7010.rb
index 97b5db3de81616c07f4465e216a5d9d72c457db6..fb1cd1b9163e9e0f143fdaf25b6d7fb9c616fba9 100644 (file)
--- a/roles/tyan-s7010.rb
+++ b/roles/tyan-s7010.rb
@@ -1,14 +1,20 @@
 name "tyan-s7010"
-description "Role applied to machines using the Tyan S710 motherboard"
+description "Role applied to machines using the Tyan S7010 motherboard"
 
 default_attributes(
   :hardware => {
-    :modules => [
-      "i2c_i801", "jc42", "w83793"
-    ],
+    :hwmon => {
+      "i2c_0_0_002f" => {
+        :ignore => %w[fan3 fan4 fan5 fan6 fan7 fan8 fan9 fan10 fan11 fan12]
+      }
+    },
+    :ipmi => {
+      :excluded_sensors => [13, 14, 15, 16, 17, 18, 19, 20]
+    },
+    :modules => %w[i2c_i801 jc42 w83793],
     :sensors => {
       "jc42-*" => {
-        :temps => { 
+        :temps => {
           "temp1" => { :max => 75 }
         }
       },
@@ -38,7 +44,7 @@ default_attributes(
           "temp6" => { :max => 78, :max_hyst => 73 }
         }
       }
-    },
+    }
   },
   :munin => {
     :plugins => {
@@ -55,6 +61,18 @@ default_attributes(
       :ipmi_temp => {
         :CPU0belowTmax => { :critical => "10:" },
         :CPU1belowTmax => { :critical => "10:" }
+      },
+      :sensors_volt => {
+        "VCoreA" => { :warning => "0.70:1.42", :critical => "0.70:1.42" },
+        "VCoreB" => { :warning => "0.70:1.42", :critical => "0.70:1.42" },
+        "in2" => { :warning => "0.00:2.05", :critical => "0.00:2.05" },
+        "in3" => { :warning => "0.00:4.08", :critical => "0.00:4.08" },
+        "in4" => { :warning => "0.00:4.08", :critical => "0.00:4.08" },
+        "in5" => { :warning => "2.99:3.54", :critical => "2.99:3.54" },
+        "in6" => { :warning => "0.00:2.04", :critical => "0.00:2.04" },
+        "+5V" => { :warning => "4.52:5.50", :critical => "4.52:5.50" },
+        "5VSB" => { :warning => "4.52:5.50", :critical => "4.52:5.50" },
+        "Vbat" => { :warning => "2.70:3.30", :critical => "2.70:3.30" }
       }
     }
   }