summaryrefslogtreecommitdiff
path: root/lib/chef/knife/bootstrap.rb
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-05-27 20:17:49 -0700
committerGitHub <noreply@github.com>2019-05-27 20:17:49 -0700
commitde9484f2804884582bb947524f7a9fd6656af7b2 (patch)
tree26311b75d1985c0ad93eb61103d0c679ed8e4634 /lib/chef/knife/bootstrap.rb
parent819307636de80266c6eb7e2072839e47f2dd4dbe (diff)
parentaa28c4e17ef1044fda844f4e9fb19f0d8e2469a2 (diff)
downloadchef-de9484f2804884582bb947524f7a9fd6656af7b2.tar.gz
Merge pull request #8460 from cc-build/dist_solo_zero
Add distro constants for solo, zero and automate
Diffstat (limited to 'lib/chef/knife/bootstrap.rb')
-rw-r--r--lib/chef/knife/bootstrap.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb
index d7f4518de6..1da36db37f 100644
--- a/lib/chef/knife/bootstrap.rb
+++ b/lib/chef/knife/bootstrap.rb
@@ -177,7 +177,7 @@ class Chef
# client.rb content via bootstrap_context
option :bootstrap_no_proxy,
long: "--bootstrap-no-proxy [NO_PROXY_URL|NO_PROXY_IP]",
- description: "Do not proxy locations for the node being bootstrapped; this option is used internally by Chef.",
+ description: "Do not proxy locations for the node being bootstrapped",
proc: Proc.new { |np| Chef::Config[:knife][:bootstrap_no_proxy] = np }
# client.rb content via bootstrap_context