Merge remote-tracking branch 'github/pull/202'

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

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 904b51e3653726ce2c04a7543a7679889b11282f..2527e16224a13c5e5b720a1079145313f0518d39 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,18 +1,46 @@
-if node[:dmi] and node[:dmi][:system]
-  case dmi.system.manufacturer
+default[:hardware][:modules] = if node[:lsb][:release].to_f >= 16.04
+                                 %w[lp]
+                               else
+                                 %w[loop lp rtc]
+                               end
+
+default[:hardware][:grub][:cmdline] = %w[nomodeset]
+default[:hardware][:sensors] = {}
+
+default[:hardware][:mcelog][:enabled] = node[:lsb][:release].to_f < 18.04
+
+if node[:dmi] && node[:dmi][:system]
+  case node[:dmi][:system][:manufacturer]

   when "HP"
   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 node[:dmi][:system][:product_name]
+    when "ProLiant DL360 G6", "ProLiant DL360 G7", "ProLiant SE326M1R2"
+      default[:hardware][:sensors][:"power_meter-*"][:power][:power1] = { :ignore => true }

     end
   end
 end
 
     end
   end
 end
 

-if node[:kernel] and node[:kernel][:modules]
-  raidmods = node[:kernel][:modules].keys & ["cciss", "hpsa", "mptsas", "mpt2sas", "megaraid_mm", "megaraid_sas", "aacraid"]
+if Chef::Util.compare_versions(node[:kernel][:release], [3, 3]).negative?
+  default[:hardware][:modules] |= ["microcode"]

 
 

-  unless raidmods.empty?
-    default[:apt][:sources] |= [ "hwraid" ]
+  if node[:cpu][:"0"][:vendor_id] == "GenuineIntel"
+    default[:hardware][:modules] |= ["coretemp"]

   end
 end
   end
 end

+
+if node[:kernel] && node[:kernel][:modules]
+  raidmods = node[:kernel][:modules].keys & %w[cciss hpsa mptsas mpt2sas mpt3sas megaraid_mm megaraid_sas aacraid]
+
+  default[:apt][:sources] |= ["hwraid"] unless raidmods.empty?
+end
+
+if node[:kernel][:modules].include?("ipmi_si")
+  default[:hardware][:modules] |= ["ipmi_devintf"]
+end
+
+if File.exist?("/proc/xen")
+  default[:hardware][:watchdog] = "xen_wdt"
+elsif node[:kernel][:modules].include?("i6300esb")
+  default[:hardware][:watchdog] = "none"
+end