X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/009bb6625414a6c93deb7c65a5764d23bb02598d..2e5da4c766bef71968e4c018751183ed31bd4633:/cookbooks/hardware/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 6a324a36e..3c2f84a68 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -191,7 +191,7 @@ node[:kernel][:modules].each_key do |modname|
   when "mptsas"
     tools_packages << "lsiutil"
     # status_packages["mpt-status"] ||= []
-  when "mpt2sas"
+  when "mpt2sas", "mpt3sas"
     tools_packages << "sas2ircu"
     status_packages["sas2ircu-status"] ||= []
   when "megaraid_mm"
@@ -327,11 +327,13 @@ if status_packages["sas2ircu-status"]
   Dir.glob("/sys/class/scsi_host/host*") do |host|
     driver = File.new("#{host}/proc_name").read.chomp
 
-    next unless driver == "mpt2sas"
+    next unless driver == "mpt2sas" || driver == "mpt3sas"
 
     bus = host.sub("/sys/class/scsi_host/host", "")
 
     Dir.glob("/sys/bus/scsi/devices/#{bus}:0:*/scsi_generic/*").each do |sg|
+      next if File.directory?("#{sg}/../../block")
+
       disks << { :device => File.basename(sg) }
     end
   end