From: Tom Hughes <tom@compton.nu>
Date: Fri, 13 Mar 2015 00:47:00 +0000 (+0000)
Subject: Don't try and SMART monitor a non-HP disk behind an HP RAID
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/695c1e5c1bb1dae68d7366f7e60991e65aec159a?hp=58eafe5641c36922c5d8422e1b0fcd6443a9b5be

Don't try and SMART monitor a non-HP disk behind an HP RAID
---

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 2e99eb21d..05d5c0794 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -262,7 +262,7 @@ end
 if status_packages["cciss-vol-status"]
   status_packages["cciss-vol-status"].each do |device|
     IO.popen(["cciss_vol_status", "-V", "/dev/#{device}"]).each do |line|
-      disks << { :device => device, :driver => "cciss", :id => Regexp.last_match[1].to_i - 1 } if line =~ / bay ([0-9]+) /
+      disks << { :device => device, :driver => "cciss", :id => Regexp.last_match[1].to_i - 1 } if line =~ / bay ([0-9]+) +HP /
     end
   end
 end