[CHEF-1746] allow the client to loop when running in foreground

also, provide the --once option to force it to run once and exit with no
splay and no run interval

1 files changed, 8 insertions, 1 deletions

diff --git a/chef/lib/chef/application/client.rb b/chef/lib/chef/application/client.rb
index a20eff84d9..4d8addd9af 100644
--- a/chef/lib/chef/application/client.rb
+++ b/chef/lib/chef/application/client.rb
@@ -89,6 +89,11 @@ class Chef::Application::Client < Chef::Application
     :description => "Run chef-client periodically, in seconds",
     :proc => lambda { |s| s.to_i }
 
+  option :once,
+    :long => "--short",
+    :description => "Cancel any interval or splay options, run chef once and exit",
+    :boolean => true
+
   option :json_attribs,
     :short => "-j JSON_ATTRIBS",
     :long => "--json-attributes JSON_ATTRIBS",
@@ -149,7 +154,9 @@ class Chef::Application::Client < Chef::Application
    
     if Chef::Config[:daemonize]
       Chef::Config[:interval] ||= 1800
-    else
+    end
+
+    if Chef::Config[:once]
       Chef::Config[:interval] = nil
       Chef::Config[:splay] = nil
     end