create archive directory on nominatim master

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

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 3a93a4ed95eed9cc0667968382a7c5cb2567576e..6a324a36e4d30846e3ff4acb4330fe4b7f67d150 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -18,6 +18,7 @@
 #
 
 include_recipe "tools"
+include_recipe "munin"
 
 case node[:cpu][:"0"][:vendor_id]
 when "GenuineIntel"
@@ -410,6 +411,12 @@ if disks.count > 0
     supports :status => true, :restart => true, :reload => true
   end
 
+  # Don't try and do munin monitoring of disks behind
+  # an Areca controller as they only allow one thing to
+  # talk to the controller at a time and smartd will
+  # throw errors if it clashes with munin
+  disks = disks.reject { |disk| disk[:driver] == "areca" }
+
   disks.each do |disk|
     munin_plugin "smart_#{disk[:munin]}" do
       target "smart_"