From: Tom Hughes <tom@compton.nu>
Date: Tue, 28 Apr 2015 19:03:00 +0000 (+0100)
Subject: Don't try and run things that aren't installed yet
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/9e6069ae06e994e399ac0952ff2a712dc968e7af?hp=d352748b416e52cc7174ab6e09f61ef82fa19347;ds=sidebyside

Don't try and run things that aren't installed yet
---

diff --git a/cookbooks/hardware/metadata.rb b/cookbooks/hardware/metadata.rb
index aa292111b..0d70a6287 100644
--- a/cookbooks/hardware/metadata.rb
+++ b/cookbooks/hardware/metadata.rb
@@ -6,3 +6,4 @@ description       "Configures hardware"
 long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))
 version           "1.0.0"
 depends           "git"
+depends           "tools"
diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index d95825669..3a93a4ed9 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+include_recipe "tools"
+
 case node[:cpu][:"0"][:vendor_id]
 when "GenuineIntel"
   package "intel-microcode"
@@ -277,7 +279,7 @@ node[:block_device].each do |name, attributes|
   disks << { :device => name } if attributes[:vendor] == "ATA"
 end
 
-if status_packages["cciss-vol-status"]
+if status_packages["cciss-vol-status"] && File.exist?("/usr/sbin/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]+) +HP /
@@ -348,7 +350,7 @@ if status_packages["aacraid-status"]
   end
 end
 
-if tools_packages.include?("areca")
+if tools_packages.include?("areca") && File.exist?("/opt/areca/x86_64/cli64")
   device = IO.popen(["lsscsi", "-g"]).grep(%r{Areca +RAID controller .*/dev/(sg[0-9]+)}) do
     Regexp.last_match[1]
   end.first