X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/13aeb5fe9e209892e40642172a95a845abb94550..6448ea6fd19e1f884e94a7adc40f971933c6ea3f:/cookbooks/hardware/attributes/default.rb

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 904b51e36..46b5893a8 100644
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,14 +1,26 @@
+default[:hardware][:modules] = [ "loop", "lp", "rtc" ]
+default[:hardware][:sensors] = {}
+
 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 Chef::Util.compare_versions(node[:kernel][:release], [3, 3]) < 0
+  default[:hardware][:modules] |= [ "microcode" ]
+
+  if node[:cpu]["0"][:vendor_id] == "GenuineIntel"
+    default[:hardware][:modules] |= [ "coretemp" ]
+  end
+end
+
 if node[:kernel] and node[:kernel][:modules]
   raidmods = node[:kernel][:modules].keys & ["cciss", "hpsa", "mptsas", "mpt2sas", "megaraid_mm", "megaraid_sas", "aacraid"]
 
@@ -16,3 +28,13 @@ if node[:kernel] and node[:kernel][:modules]
     default[:apt][:sources] |= [ "hwraid" ]
   end
 end
+
+if node[:kernel][:modules].include?("ipmi_si")
+  default[:hardware][:modules] |= [ "ipmi_devintf" ]
+end
+
+if File.exists?("/proc/xen")
+  default[:hardware][:watchdog] = "xen_wdt"
+elsif node[:kernel][:modules].include?("i6300esb")
+  default[:hardware][:watchdog] = "none"
+end