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

[chef.git] / cookbooks / hardware / recipes / default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 2e99eb21d94707805859b8dbec347cbd461c12b3..05d5c0794b2f69da68711e7bd73cfe492e220b2a 100644 (file)
--- 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|
 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
     end
   end
 end