Make sure mod_php is disabled when we're using FPM

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

diff --git a/roles/tyan-s7010.rb b/roles/tyan-s7010.rb
index 156d672d70e1e0275d2ac9ea1192b2700617f967..c6e21bd9afb13fa9ae23f21cf88aafafb996ce39 100644 (file)
--- a/roles/tyan-s7010.rb
+++ b/roles/tyan-s7010.rb
@@ -1,11 +1,12 @@
 name "tyan-s7010"
 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 => {
 
 default_attributes(
   :hardware => {

+    :modules => %w[i2c_i801 jc42 w83793],

     :sensors => {
       "jc42-*" => {
     :sensors => {
       "jc42-*" => {

-        :temps => { 
+        :temps => {

           "temp1" => { :max => 75 }
         }
       },
           "temp1" => { :max => 75 }
         }
       },


@@ -35,23 +36,35 @@ default_attributes(
           "temp6" => { :max => 78, :max_hyst => 73 }
         }
       }
           "temp6" => { :max => 78, :max_hyst => 73 }
         }
       }

-    },
+    }

   },
   :munin => {
     :plugins => {
       :ipmi_fans => {
   },
   :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:" },
         :CPU1belowTmax => { :critical => "10:" }
       },
       :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" }

       }
     }
   }
       }
     }
   }