X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8f44145bec3b4afb29989d4cf3e97ad619e5375f..025f05041c746a1602697d2edce62ed75eac6df9:/cookbooks/hardware/recipes/default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index ad64ae56b..b10eff2db 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -106,7 +106,7 @@ unless unit.nil?
     provider Chef::Provider::Service::Upstart
     action [ :enable, :start ]
     supports :status => true, :restart => true, :reload => false
-    subscribes :restart, resources(:template => "/etc/init/ttyS#{unit}.conf")
+    subscribes :restart, "template[/etc/init/ttyS#{unit}.conf]"
   end
 end
 
@@ -122,7 +122,7 @@ if File.exist?("/etc/default/grub")
     group "root"
     mode 0644
     variables :unit => unit, :speed => speed
-    notifies :run, resources(:execute => "update-grub")
+    notifies :run, "execute[update-grub]"
   end
 end
 
@@ -141,31 +141,48 @@ template "/etc/initramfs-tools/conf.d/mdadm" do
   notifies :run, "execute[update-initramfs]"
 end
 
+if node[:kernel][:modules].include?("ipmi_si")
+  package "ipmitool"
+end
+
 tools_packages = []
-status_packages = []
+status_packages = {}
 
 node[:kernel][:modules].each_key do |modname|
   case modname
   when "cciss"
     tools_packages << "hpacucli"
-    status_packages << "cciss-vol-status"
+    status_packages["cciss-vol-status"] ||= []
   when "hpsa"
     tools_packages << "hpacucli"
+    status_packages["cciss-vol-status"] ||= []
   when "mptsas"
     tools_packages << "lsiutil"
-    status_packages << "mpt-status"
+    #status_packages["mpt-status"] ||= []
   when "mpt2sas"
     tools_packages << "sas2ircu"
-    status_packages << "sas2ircu-status"
+    status_packages["sas2ircu-status"] ||= []
   when "megaraid_mm"
     tools_packages << "megactl"
-    status_packages << "megaraid-status"
+    status_packages["megaraid-status"] ||= []
   when "megaraid_sas"
     tools_packages << "megacli"
-    status_packages << "megaclisas-status"
+    status_packages["megaclisas-status"] ||= []
   when "aacraid"
     tools_packages << "arcconf"
-    status_packages << "aacraid-status"
+    status_packages["aacraid-status"] ||= []
+  end
+end
+
+node[:block_device].each do |name,attributes|
+  if attributes[:vendor] == "HP" and attributes[:model] == "LOGICAL VOLUME"
+    if name =~ /^cciss!(c[0-9]+)d[0-9]+$/
+      status_packages["cciss-vol-status"] |= [ "cciss/#{$1}d0" ]
+    else
+      Dir.glob("/sys/block/#{name}/device/scsi_generic/*").each do |sg|
+        status_packages["cciss-vol-status"] |= [ File.basename(sg) ]
+      end
+    end
   end
 end
 
@@ -188,6 +205,7 @@ end
       owner "root"
       group "root"
       mode 0644
+      variables :devices => status_packages[status_package]
     end
 
     service "#{status_package}d" do