More work on automatic installation of raid tools

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

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 24dc2505d2f845f4e7eb375b663ca2091a3e7ebc..6b12827ca64a4cd0ec3941943c2f3fddcbac67ba 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -10,15 +10,9 @@ if node[:dmi] and node[:dmi][:system]
 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", "mptsas", "mpt2sas", "megaraid_mm", "megaraid_sas", "aacraid"]
 
-  if node[:kernel][:modules].include?("aacraid")
+  unless raidmods.empty?
     default[:apt][:sources] |= [ "hwraid" ]
   end
 end