summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYossi Gottlieb <yossigo@gmail.com>2015-10-28 10:47:20 +0200
committerYossi Gottlieb <yossigo@gmail.com>2015-10-28 10:47:20 +0200
commitbc2ed52e15285319161b7bfdff238d24fe4957a8 (patch)
treec000c10d8f4d7f9bf34916208f80aed63ca7dc39
parenta149e877f3be248fdff8ea028772c65393cb16a5 (diff)
downloadchef-bc2ed52e15285319161b7bfdff238d24fe4957a8.tar.gz
Clean up knife options handling.
-rw-r--r--lib/chef/knife/bootstrap.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb
index 23e3271964..805eee8481 100644
--- a/lib/chef/knife/bootstrap.rb
+++ b/lib/chef/knife/bootstrap.rb
@@ -99,13 +99,11 @@ class Chef
option :bootstrap_proxy_user,
:long => "--bootstrap-proxy-user PROXY_USER",
- :description => "The proxy authentication username for the node being bootstrapped",
- :proc => Proc.new { |p| Chef::Config[:knife][:bootstrap_proxy_user] = p }
+ :description => "The proxy authentication username for the node being bootstrapped"
option :bootstrap_proxy_pass,
:long => "--bootstrap-proxy-pass PROXY_PASS",
- :description => "The proxy authentication password for the node being bootstrapped",
- :proc => Proc.new { |p| Chef::Config[:knife][:bootstrap_proxy_pass] = p }
+ :description => "The proxy authentication password for the node being bootstrapped"
option :bootstrap_no_proxy,
:long => "--bootstrap-no-proxy [NO_PROXY_URL|NO_PROXY_IP]",