X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/b5fb6f1ea5350f2d792a6f882b47631ac67ee407..dad78982f77fb5b8afc07bb3b7bbe6840ecec508:/cookbooks/hardware/attributes/default.rb

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 24dc2505d..45b46a18a 100644
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,24 +1,21 @@
+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 node[:kernel] and node[:kernel][:modules]
-  if node[:kernel][:modules].include?("mpt2sas")
-    default[:apt][:sources] |= [ "hwraid" ]
-  end
-
-  if node[:kernel][:modules].include?("megaraid_sas")
-    default[:apt][:sources] |= [ "hwraid" ]
-  end
+  raidmods = node[:kernel][:modules].keys & ["cciss", "hpsa", "mptsas", "mpt2sas", "megaraid_mm", "megaraid_sas", "aacraid"]
 
-  if node[:kernel][:modules].include?("aacraid")
+  unless raidmods.empty?
     default[:apt][:sources] |= [ "hwraid" ]
   end
 end