diff options
Diffstat (limited to 'lib/chef/application/solo.rb')
| -rw-r--r-- | lib/chef/application/solo.rb | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb index 5655b8cdfd..72db3e89d9 100644 --- a/lib/chef/application/solo.rb +++ b/lib/chef/application/solo.rb @@ -39,11 +39,11 @@ class Chef::Application::Solo < Chef::Application short: "-c CONFIG", long: "--config CONFIG", default: Chef::Config.platform_specific_path("/etc/chef/solo.rb"), - description: "The configuration file to use" + description: "The configuration file to use." option :config_option, long: "--config-option OPTION=VALUE", - description: "Override a single configuration option", + description: "Override a single configuration option.", proc: lambda { |option, existing| (existing ||= []) << option existing @@ -52,24 +52,24 @@ class Chef::Application::Solo < Chef::Application option :formatter, short: "-F FORMATTER", long: "--format FORMATTER", - description: "output format to use", + description: "The output format to use.", proc: lambda { |format| Chef::Config.add_formatter(format) } option :force_logger, long: "--force-logger", - description: "Use logger output instead of formatter output", + description: "Use logger output instead of formatter output.", boolean: true, default: false option :force_formatter, long: "--force-formatter", - description: "Use formatter output instead of logger output", + description: "Use formatter output instead of logger output.", boolean: true, default: false option :profile_ruby, long: "--[no-]profile-ruby", - description: "Dump complete Ruby call graph stack of entire #{Chef::Dist::PRODUCT} run (expert only)", + description: "Dump complete Ruby call graph stack of entire #{Chef::Dist::PRODUCT} run (expert only).", boolean: true, default: false @@ -77,24 +77,24 @@ class Chef::Application::Solo < Chef::Application long: "--[no-]color", boolean: true, default: true, - description: "Use colored output, defaults to enabled" + description: "Use colored output, defaults to enabled." option :log_level, short: "-l LEVEL", long: "--log_level LEVEL", - description: "Set the log level (auto, trace, debug, info, warn, error, fatal)", + description: "Set the log level (auto, trace, debug, info, warn, error, fatal).", proc: lambda { |l| l.to_sym } option :log_location, short: "-L LOGLOCATION", long: "--logfile LOGLOCATION", - description: "Set the log file location, defaults to STDOUT - recommended for daemonizing", + description: "Set the log file location, defaults to STDOUT - recommended for daemonizing.", proc: nil option :help, short: "-h", long: "--help", - description: "Show this message", + description: "Show this help message.", on: :tail, boolean: true, show_options: true, @@ -103,50 +103,50 @@ class Chef::Application::Solo < Chef::Application option :user, short: "-u USER", long: "--user USER", - description: "User to set privilege to", + description: "User to set privilege to.", proc: nil option :group, short: "-g GROUP", long: "--group GROUP", - description: "Group to set privilege to", + description: "Group to set privilege to.", proc: nil unless Chef::Platform.windows? option :daemonize, short: "-d", long: "--daemonize", - description: "Daemonize the process", + description: "Daemonize the process.", proc: lambda { |p| true } end option :lockfile, long: "--lockfile LOCKFILE", - description: "Set the lockfile location. Prevents multiple solo processes from converging at the same time", + description: "Set the lockfile location. Prevents multiple solo processes from converging at the same time.", proc: nil option :interval, short: "-i SECONDS", long: "--interval SECONDS", - description: "Run #{Chef::Dist::CLIENT} periodically, in seconds", + description: "Run #{Chef::Dist::CLIENT} periodically, in seconds.", proc: lambda { |s| s.to_i } option :json_attribs, short: "-j JSON_ATTRIBS", long: "--json-attributes JSON_ATTRIBS", - description: "Load attributes from a JSON file or URL", + description: "Load attributes from a JSON file or URL.", proc: nil option :node_name, short: "-N NODE_NAME", long: "--node-name NODE_NAME", - description: "The node name for this client", + description: "The node name for this client.", proc: nil option :splay, short: "-s SECONDS", long: "--splay SECONDS", - description: "The splay time for running at intervals, in seconds", + description: "The splay time for running at intervals, in seconds.", proc: lambda { |s| s.to_i } option :recipe_url, @@ -157,7 +157,7 @@ class Chef::Application::Solo < Chef::Application option :version, short: "-v", long: "--version", - description: "Show #{Chef::Dist::EXEC} version", + description: "Show #{Chef::Dist::PRODUCT} version.", boolean: true, proc: lambda { |v| puts "#{Chef::Dist::PRODUCT}: #{::Chef::VERSION}" }, exit: 0 @@ -165,7 +165,7 @@ class Chef::Application::Solo < Chef::Application option :override_runlist, short: "-o RunlistItem,RunlistItem...", long: "--override-runlist RunlistItem,RunlistItem...", - description: "Replace current run list with specified items for a single run", + description: "Replace current run list with specified items for a single run.", proc: lambda { |items| items = items.split(",") items.compact.map do |item| @@ -176,23 +176,23 @@ class Chef::Application::Solo < Chef::Application option :client_fork, short: "-f", long: "--[no-]fork", - description: "Fork client" + description: "Fork client." option :why_run, short: "-W", long: "--why-run", - description: "Enable whyrun mode", + description: "Enable whyrun mode.", boolean: true option :ez, long: "--ez", - description: "A memorial for Ezra Zygmuntowicz", + description: "A memorial for Ezra Zygmuntowicz.", boolean: true option :environment, short: "-E ENVIRONMENT", long: "--environment ENVIRONMENT", - description: "Set the #{Chef::Dist::PRODUCT} Environment on the node" + description: "Set the #{Chef::Dist::PRODUCT} environment on the node." option :run_lock_timeout, long: "--run-lock-timeout SECONDS", @@ -201,17 +201,17 @@ class Chef::Application::Solo < Chef::Application option :minimal_ohai, long: "--minimal-ohai", - description: "Only run the bare minimum ohai plugins #{Chef::Dist::PRODUCT} needs to function", + description: "Only run the bare minimum Ohai plugins #{Chef::Dist::PRODUCT} needs to function.", boolean: true option :delete_entire_chef_repo, long: "--delete-entire-chef-repo", - description: "DANGEROUS: does what it says, only useful with --recipe-url", + description: "DANGEROUS: does what it says, only useful with --recipe-url.", boolean: true option :solo_legacy_mode, long: "--legacy-mode", - description: "Run chef-solo in legacy mode", + description: "Run chef-solo in legacy mode.", boolean: true attr_reader :chef_client_json @@ -366,7 +366,7 @@ class Chef::Application::Solo < Chef::Application end def unforked_interval_error_message - "Unforked #{Chef::Dist::CLIENT} interval runs are disabled in #{Chef::Dist::PRODUCT} 12." + + "Unforked #{Chef::Dist::CLIENT} interval runs are disabled bvy default." + "\nConfiguration settings:" + ("\n interval = #{Chef::Config[:interval]} seconds" if Chef::Config[:interval]).to_s + "\nEnable #{Chef::Dist::CLIENT} interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options." |