Bring ramoth's watchdog under chef control

[chef.git] / cookbooks / hardware / attributes / default.rb

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 73940d9b7d29cda002eb0e2837bac5b4427efe02..8b794cab78df5e2e6396374215f90d7fdbce08bb 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,16 +1,27 @@
+default[:hardware][:sensors] = {}
+

 if node[:dmi] and node[:dmi][:system]
   case dmi.system.manufacturer
   when "HP"
 if node[:dmi] and node[:dmi][:system]
   case dmi.system.manufacturer
   when "HP"

-    if node[:lsb][:release].to_f <= 11.10
-      default[:apt][:sources] |= [ "proliant-support-pack" ]
-    else
-      default[:apt][:sources] |= [ "management-component-pack" ]
+    default[:apt][:sources] |= [ "management-component-pack" ]
+
+    case dmi.system.product_name
+      when "ProLiant DL360 G6", "ProLiant DL360 G7"
+        default[:hardware][:sensors]["power_meter-*"][:power]["power1"] = { :ignore => true }

     end
   end
 end
 
 if node[:kernel] and node[:kernel][:modules]
     end
   end
 end
 
 if node[:kernel] and node[:kernel][:modules]

-  if node[:kernel][:modules].include?("mpt2sas")
+  raidmods = node[:kernel][:modules].keys & ["cciss", "hpsa", "mptsas", "mpt2sas", "megaraid_mm", "megaraid_sas", "aacraid"]
+
+  unless raidmods.empty?

     default[:apt][:sources] |= [ "hwraid" ]
   end
 end
     default[:apt][:sources] |= [ "hwraid" ]
   end
 end

+
+if File.exists?("/proc/xen")
+  default[:hardware][:watchdog] = "xen_wdt"
+elsif node[:kernel][:modules].include?("i6300esb")
+  default[:hardware][:watchdog] = "none"
+end