planet: wait for s3 replication to complete

[chef.git] / roles / hp-dl180-g6.rb

diff --git a/roles/hp-dl180-g6.rb b/roles/hp-dl180-g6.rb
index 5eef3246ae12e7f320f288db8442844df7f8b718..20125bb34e45ce66f2a1f18f67829e7c644fe77d 100644 (file)
--- a/roles/hp-dl180-g6.rb
+++ b/roles/hp-dl180-g6.rb
@@ -2,8 +2,20 @@ name "hp-dl180-g6"
 description "Role applied to all HP DL180 G6 machines"
 
 default_attributes(
+  :hardware => {
+    :blacklisted_modules => %w[acpi_power_meter]
+  },
   :munin => {
     :plugins => {
+      :hpasmcli2_fans => {
+        :fan1 => { :warning => "98", :critical => "100" },
+        :fan2 => { :warning => "98", :critical => "100" },
+        :fan3 => { :warning => "98", :critical => "100" },
+        :fan4 => { :warning => "98", :critical => "100" }
+      },
+      :hpasmcli2_temp => {
+        :temp3 => { :warning => "80.0", :critical => "85" }
+      },
       :ipmi_temp => {
         :Temp1 => { :label => "Air Inlet" },
         :Temp2CPU1 => { :warning => ":", :label => "CPU 1" },