Fix style issues found by new rubocop version

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

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 6b12827ca64a4cd0ec3941943c2f3fddcbac67ba..174190f3fc42b923883708d833bd5dbf2cf16b65 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,18 +1,40 @@
-if node[:dmi] and node[:dmi][:system]
+default[:hardware][:modules] = %w(loop lp rtc)
+default[:hardware][:sensors] = {}
+
+if node[:dmi] && 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]
-  raidmods = node[:kernel][:modules].keys & ["cciss", "mptsas", "mpt2sas", "megaraid_mm", "megaraid_sas", "aacraid"]
+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 megaraid_mm megaraid_sas aacraid)
 
   unless raidmods.empty?
-    default[:apt][:sources] |= [ "hwraid" ]
+    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