diff options
author | Yossi Gottlieb <yossigo@gmail.com> | 2015-10-14 15:03:15 +0300 |
---|---|---|
committer | Yossi Gottlieb <yossigo@gmail.com> | 2015-10-14 15:03:15 +0300 |
commit | a149e877f3be248fdff8ea028772c65393cb16a5 (patch) | |
tree | 29fa4dcb9813bfa13281f23c4cf97dd94e17ae35 | |
parent | 6200bf0d319a236f2ab93e83166919c392a22abf (diff) | |
download | chef-a149e877f3be248fdff8ea028772c65393cb16a5.tar.gz |
Add bootstrap proxy authentication support.
-rw-r--r-- | lib/chef/knife/bootstrap.rb | 10 | ||||
-rw-r--r-- | lib/chef/knife/core/bootstrap_context.rb | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb index 93236225a2..23e3271964 100644 --- a/lib/chef/knife/bootstrap.rb +++ b/lib/chef/knife/bootstrap.rb @@ -97,6 +97,16 @@ class Chef :description => "The proxy server for the node being bootstrapped", :proc => Proc.new { |p| Chef::Config[:knife][:bootstrap_proxy] = p } + 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 } + + 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 } + 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 Opscode", diff --git a/lib/chef/knife/core/bootstrap_context.rb b/lib/chef/knife/core/bootstrap_context.rb index d210b9418f..34d016ea9a 100644 --- a/lib/chef/knife/core/bootstrap_context.rb +++ b/lib/chef/knife/core/bootstrap_context.rb @@ -108,6 +108,16 @@ CONFIG client_rb << %Q{https_proxy "#{knife_config[:bootstrap_proxy]}"\n} end + if knife_config[:bootstrap_proxy_user] + client_rb << %Q{http_proxy_user "#{knife_config[:bootstrap_proxy_user]}"\n} + client_rb << %Q{https_proxy_user "#{knife_config[:bootstrap_proxy_user]}"\n} + end + + if knife_config[:bootstrap_proxy_pass] + client_rb << %Q{http_proxy_pass "#{knife_config[:bootstrap_proxy_pass]}"\n} + client_rb << %Q{https_proxy_pass "#{knife_config[:bootstrap_proxy_pass]}"\n} + end + if knife_config[:bootstrap_no_proxy] client_rb << %Q{no_proxy "#{knife_config[:bootstrap_no_proxy]}"\n} end |