X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/98c7efd2865cf1842f3b937e63f5cee11f455d3a..4f2ccd7619328a448bf3141ab234e0e95c79c478:/cookbooks/hardware/recipes/default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index bb7de4a98..5183978ff 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -20,6 +20,10 @@
 include_recipe "tools"
 include_recipe "munin"
 
+ohai_plugin "hardware" do
+  template "ohai.rb.erb"
+end
+
 case node[:cpu][:"0"][:vendor_id]
 when "GenuineIntel"
   package "intel-microcode"
@@ -307,7 +311,7 @@ if status_packages["cciss-vol-status"] && File.exist?("/usr/sbin/cciss_vol_statu
   end
 end
 
-if status_packages["megaclisas-status"]
+if status_packages["megaclisas-status"] && File.exist?("/usr/sbin/megacli")
   controller = 0
 
   Dir.glob("/sys/class/scsi_host/host*") do |host|
@@ -452,18 +456,21 @@ if disks.count > 0
       conf_variables :disk => disk
     end
   end
+else
+  service "smartmontools" do
+    action [:stop, :disable]
+  end
+end
 
+if disks.count > 0
   munin_plugin "hddtemp_smartctl" do
     conf "munin.hddtemp.erb"
     conf_variables :disks => disks
   end
 else
-  service "smartmontools" do
-    action [:stop, :disable]
-  end
-
   munin_plugin "hddtemp_smartctl" do
     action :delete
+    conf "munin.hddtemp.erb"
   end
 end