From: Tom Hughes <tom@compton.nu>
Date: Mon, 20 Jul 2015 22:07:23 +0000 (+0100)
Subject: Don't monitor unraided disks on mpt2/mpt3 controllers twice
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c7c31f3c269d2b1df845a94e59e34cd52e0b296d

Don't monitor unraided disks on mpt2/mpt3 controllers twice
---

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index f19446969..3c2f84a68 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -332,6 +332,8 @@ if status_packages["sas2ircu-status"]
     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