X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/361ede788a09f6dd16b075d40f8b952493aafff8..4bb5cdcc5d392db7cbe59e71d2b448f1f146a434:/cookbooks/hardware/recipes/default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index c568cafd4..a81e0966c 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -141,62 +141,81 @@ template "/etc/initramfs-tools/conf.d/mdadm" do
   notifies :run, "execute[update-initramfs]"
 end
 
-["cciss", "hpsa", "mptsas", "mpt2sas", "megaraid_mm", "megaraid_sas", "aacraid"].each do |raidmod|
-  case raidmod
+tools_packages = []
+status_packages = {}
+
+node[:kernel][:modules].each_key do |modname|
+  case modname
   when "cciss"
-    tools_package = "hpacucli"
-    status_package = "cciss-vol-status"
+    tools_packages << "hpacucli"
+    status_packages["cciss-vol-status"] ||= []
   when "hpsa"
-    tools_package = "hpacucli"
+    tools_packages << "hpacucli"
+    status_packages["cciss-vol-status"] ||= []
   when "mptsas"
-    tools_package = "lsiutil"
-    status_package = "mpt-status"
+    tools_packages << "lsiutil"
+    #status_packages["mpt-status"] ||= []
   when "mpt2sas"
-    tools_package = "sas2ircu"
-    status_package = "sas2ircu-status"
+    tools_packages << "sas2ircu"
+    status_packages["sas2ircu-status"] ||= []
   when "megaraid_mm"
-    tools_package = "megactl"
-    status_package = "megaraid-status"
+    tools_packages << "megactl"
+    status_packages["megaraid-status"] ||= []
   when "megaraid_sas"
-    tools_package = "megacli"
-    status_package = "megaclisas-status"
+    tools_packages << "megacli"
+    status_packages["megaclisas-status"] ||= []
   when "aacraid"
-    tools_package = "arcconf"
-    status_package = "aacraid-status"
+    tools_packages << "arcconf"
+    status_packages["aacraid-status"] ||= []
   end
+end
 
-  if node[:kernel][:modules].include?(raidmod)
+node[:block_device].each do |name,attributes|
+  if attributes[:vendor] == "HP" and attributes[:model] == "LOGICAL VOLUME"
+    if name =~ /^cciss!(.*)$/
+      status_packages["cciss-vol-status"] |= [ "cciss/#{$1}" ]
+    else
+      Dir.glob("/sys/block/#{name}/device/scsi_generic/*").each do |sg|
+        status_packages["cciss-vol-status"] |= [ File.basename(sg) ]
+      end
+    end
+  end
+end
+
+["hpacucli", "lsiutil", "sas2ircu", "megactl", "megacli", "arcconf"].each do |tools_package|
+  if tools_packages.include?(tools_package)
     package tools_package
+  else
+    package tools_package do
+      action :purge
+    end
+  end
+end
 
-    if status_package
-      package status_package
+["cciss-vol-status", "mpt-status", "sas2ircu-status", "megaraid-status", "megaclisas-status", "aacraid-status"].each do |status_package|
+  if status_packages.include?(status_package)
+    package status_package
 
-      template "/etc/default/#{status_package}d" do
-        source "raid.default.erb"
-        owner "root"
-        group "root"
-        mode 0644
-      end
+    template "/etc/default/#{status_package}d" do
+      source "raid.default.erb"
+      owner "root"
+      group "root"
+      mode 0644
+      variables :devices => status_packages[status_package]
+    end
 
-      service "#{status_package}d" do
-        action [ :start, :enable ]
-        supports :status => false, :restart => true, :reload => false
-        subscribes :restart, "template[/etc/default/#{status_package}d]"
-      end
+    service "#{status_package}d" do
+      action [ :start, :enable ]
+      supports :status => false, :restart => true, :reload => false
+      subscribes :restart, "template[/etc/default/#{status_package}d]"
     end
   else
-    if status_package
-      package status_package do
-        action :purge
-      end
-
-      file "/etc/default/#{status_package}d" do
-        action :delete
-      end
+    package status_package do
+      action :purge
     end
 
-    package tools_package do
-      action :purge
+    file "/etc/default/#{status_package}d" do
+      action :delete
     end
   end
 end