Disable chef exception handler

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

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index a18a293a04a01b461c5100fb6a0fab9a531632e6..d266674368179346129cd7c0c20244076f2be771 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -21,7 +21,7 @@ include_recipe "tools"
 include_recipe "munin"
 
 ohai_plugin "hardware" do
 include_recipe "munin"
 
 ohai_plugin "hardware" do

-  template_source "ohai.rb.erb"
+  template "ohai.rb.erb"

 end
 
 case node[:cpu][:"0"][:vendor_id]
 end
 
 case node[:cpu][:"0"][:vendor_id]


@@ -86,6 +86,7 @@ if manufacturer == "HP"
   %w[/opt/hp/hp-health/bin/hpasmd /usr/lib/libhpasmintrfc.so.3.0 %/usr/lib/libhpasmintrfc.so.3 /usr/lib/libhpasmintrfc.so].each do |filename|
     file filename do
       action :delete
   %w[/opt/hp/hp-health/bin/hpasmd /usr/lib/libhpasmintrfc.so.3.0 %/usr/lib/libhpasmintrfc.so.3 /usr/lib/libhpasmintrfc.so].each do |filename|
     file filename do
       action :delete

+      manage_symlink_source false

     end
   end
 
     end
   end