Merge pull request #2516 from adamhjk/ez-mode

A memorial for Ezra Zygmuntowicz

2 files changed, 19 insertions, 0 deletions

diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb
index c99170f437..6e568ddbb1 100644
--- a/lib/chef/application/solo.rb
+++ b/lib/chef/application/solo.rb
@@ -160,6 +160,11 @@ class Chef::Application::Solo < Chef::Application
     :description  => 'Enable whyrun mode',
     :boolean      => true
 
+  option :ez,
+    :long         => '--ez',
+    :description  => 'A memorial for Ezra Zygmuntowicz',
+    :boolean      => true
+
   option :environment,
     :short        => '-E ENVIRONMENT',
     :long         => '--environment ENVIRONMENT',
@@ -213,6 +218,7 @@ class Chef::Application::Solo < Chef::Application
   end
 
   def run_application
+    for_ezra if Chef::Config[:ez]
     if !Chef::Config[:client_fork] || Chef::Config[:once]
       # Run immediately without interval sleep or splay
       begin
@@ -227,7 +233,19 @@ class Chef::Application::Solo < Chef::Application
     end
   end
 
+
   private
+
+  def for_ezra
+    puts <<-EOH
+For Ezra Zygmuntowicz:
+  The man who brought you Chef Solo
+  Early contributor to Chef
+  Kind hearted open source advocate
+  Rest in peace, Ezra.
+EOH
+  end
+
   def interval_run_chef_client
     if Chef::Config[:daemonize]
       Chef::Daemon.daemonize("chef-client")
diff --git a/lib/chef/config.rb b/lib/chef/config.rb
index c3fd939628..4b83a0eca3 100644
--- a/lib/chef/config.rb
+++ b/lib/chef/config.rb
@@ -317,6 +317,7 @@ class Chef
     default :why_run, false
     default :color, false
     default :client_fork, true
+    default :ez, false
     default :enable_reporting, true
     default :enable_reporting_url_fatals, false