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 6b188e7ff29ddd3a1b99f12b1786789fead27b83..fb1cd1b9163e9e0f143fdaf25b6d7fb9c616fba9 100644 (file)
--- a/roles/tyan-s7010.rb
+++ b/roles/tyan-s7010.rb
@@ -1,9 +1,17 @@
 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 => %w(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 => {
@@ -54,7 +62,7 @@ default_attributes(
         :CPU0belowTmax => { :critical => "10:" },
         :CPU1belowTmax => { :critical => "10:" }
       },
-      :sensors_volts => {
+      :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" },