summaryrefslogtreecommitdiff
path: root/lib/chef/application
diff options
context:
space:
mode:
authorMarc Chamberland <mchamberland@pbsc.com>2019-05-05 18:55:51 -0400
committerMarc Chamberland <mchamberland@pbsc.com>2019-05-23 12:29:44 -0400
commit44aae2c29d0c4ba28b4dbfc8c638036d8a2663ec (patch)
tree1b1c1aff271923af23e987f36f98183ba20a59c9 /lib/chef/application
parentf5de2c58ea3705a20a6784251a3cd8a58618f24d (diff)
downloadchef-44aae2c29d0c4ba28b4dbfc8c638036d8a2663ec.tar.gz
distro constants for solo, zero and automate
Signed-off-by: Marc Chamberland <mchamberland@pbsc.com>
Diffstat (limited to 'lib/chef/application')
-rw-r--r--lib/chef/application/client.rb4
-rw-r--r--lib/chef/application/knife.rb4
-rw-r--r--lib/chef/application/solo.rb4
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb
index 9ba1502409..6363b9cdc7 100644
--- a/lib/chef/application/client.rb
+++ b/lib/chef/application/client.rb
@@ -252,11 +252,11 @@ class Chef::Application::Client < Chef::Application
option :chef_zero_host,
long: "--chef-zero-host HOST",
- description: "Host to start chef-zero on."
+ description: "Host to start #{Chef::Dist::ZERO} on."
option :chef_zero_port,
long: "--chef-zero-port PORT",
- description: "Port (or port range) to start chef-zero on. Port ranges like 1000,1010 or 8889-9999 will try all given ports until one works."
+ description: "Port (or port range) to start #{Chef::Dist::ZERO} on. Port ranges like 1000,1010 or 8889-9999 will try all given ports until one works."
option :disable_config,
long: "--disable-config",
diff --git a/lib/chef/application/knife.rb b/lib/chef/application/knife.rb
index 82493d5140..6f192a3e1f 100644
--- a/lib/chef/application/knife.rb
+++ b/lib/chef/application/knife.rb
@@ -124,11 +124,11 @@ class Chef::Application::Knife < Chef::Application
option :chef_zero_host,
long: "--chef-zero-host HOST",
- description: "Host to start chef-zero on."
+ description: "Host to start #{Chef::Dist::ZERO} on."
option :chef_zero_port,
long: "--chef-zero-port PORT",
- description: "Port (or port range) to start chef-zero on. Port ranges like 1000,1010 or 8889-9999 will try all given ports until one works."
+ description: "Port (or port range) to start #{Chef::Dist::ZERO} on. Port ranges like 1000,1010 or 8889-9999 will try all given ports until one works."
option :listen,
long: "--[no-]listen",
diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb
index f11654ddd5..5cb6e56807 100644
--- a/lib/chef/application/solo.rb
+++ b/lib/chef/application/solo.rb
@@ -124,7 +124,7 @@ class Chef::Application::Solo < Chef::Application
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 #{Chef::Dist::SOLO} processes from converging at the same time.",
proc: nil
option :interval,
@@ -213,7 +213,7 @@ class Chef::Application::Solo < Chef::Application
option :solo_legacy_mode,
long: "--legacy-mode",
- description: "Run chef-solo in legacy mode.",
+ description: "Run #{Chef::Dist::SOLO} in legacy mode.",
boolean: true
attr_reader :chef_client_json