Fix use of deprecated features

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

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 73940d9b7d29cda002eb0e2837bac5b4427efe02..f77967a208604013e7ca5f50858f6a744748a23a 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,16 +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] = {}
+
+if node[:dmi] && node[:dmi][:system]
+  case node[: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 node[: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]
-  if node[:kernel][:modules].include?("mpt2sas")
-    default[:apt][:sources] |= [ "hwraid" ]
+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] && node[:kernel][:modules]
+  raidmods = node[:kernel][:modules].keys & %w(cciss hpsa mptsas mpt2sas mpt3sas megaraid_mm megaraid_sas aacraid)
+
+  unless raidmods.empty?
+    default[:apt][:sources] |= ["hwraid"]
   end
 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