ProLiantSupportPack does not exist anymore

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

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 73940d9b7d29cda002eb0e2837bac5b4427efe02..39b272b05d4f9c4da6322931ddbe90e477e41616 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,16 +1,14 @@
 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" ]
-    end
+    default[:apt][:sources] |= [ "management-component-pack" ]
   end
 end
 
 if node[:kernel] and node[:kernel][:modules]
-  if node[:kernel][:modules].include?("mpt2sas")
+  raidmods = node[:kernel][:modules].keys & ["cciss", "hpsa", "mptsas", "mpt2sas", "megaraid_mm", "megaraid_sas", "aacraid"]
+
+  unless raidmods.empty?
     default[:apt][:sources] |= [ "hwraid" ]
   end
 end