From 78a1ea04a1b870bf93856e3bca38e9e6287b9478 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 24 Mar 2015 23:00:49 +0000 Subject: [PATCH] Cope with gems needed for chef reporting not being installed --- .../chef/templates/default/client.rb.erb | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/cookbooks/chef/templates/default/client.rb.erb b/cookbooks/chef/templates/default/client.rb.erb index c276ed6c0..92c96feb3 100644 --- a/cookbooks/chef/templates/default/client.rb.erb +++ b/cookbooks/chef/templates/default/client.rb.erb @@ -9,10 +9,6 @@ Encoding.default_external = Encoding::UTF_8 -# Load supporting code for report handlers - -require "/etc/chef/report" - # Log at level info log_level :info @@ -29,15 +25,27 @@ ssl_verify_mode :verify_peer chef_server_url "https://chef.openstreetmap.org" -# Create report handler +# Make our plugins visible to ohai -email_handler = Chef::Handler::Email.new(:to => "tom@compton.nu") +Ohai::Config[:plugin_path] << "<%= node[:ohai][:plugin_dir] %>" -# Configure report handlers +begin -exception_handlers << email_handler -report_handlers << email_handler + # Load supporting code for report handlers -# Make our plugins visible to ohai + require "/etc/chef/report" -Ohai::Config[:plugin_path] << "<%= node[:ohai][:plugin_dir] %>" + # Create report handler + + email_handler = Chef::Handler::Email.new(:to => "tom@compton.nu") + + # Configure report handlers + + exception_handlers << email_handler + report_handlers << email_handler + +rescue + + # Ignore errors in case required gems not installed yet + +end -- 2.43.2