diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-08-02 10:33:31 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-02 10:33:31 -0700 |
commit | 01ed0309458e69a43cf984b87961baba0857fc3d (patch) | |
tree | 76e70aef2e8b3bc65e4a3449c5eb738e5c35b408 /lib/chef/knife/core | |
parent | a5b4567cfa6ddfd4f385e4ad6b70a0c312b91a86 (diff) | |
parent | bc2ed52e15285319161b7bfdff238d24fe4957a8 (diff) | |
download | chef-01ed0309458e69a43cf984b87961baba0857fc3d.tar.gz |
Merge pull request #4059 from yossigo/bootstrap_proxy_auth
Add bootstrap proxy authentication support.
Diffstat (limited to 'lib/chef/knife/core')
-rw-r--r-- | lib/chef/knife/core/bootstrap_context.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/chef/knife/core/bootstrap_context.rb b/lib/chef/knife/core/bootstrap_context.rb index 6db1a83c73..b2670f196b 100644 --- a/lib/chef/knife/core/bootstrap_context.rb +++ b/lib/chef/knife/core/bootstrap_context.rb @@ -114,6 +114,16 @@ validation_client_name "#{@chef_config[:validation_client_name]}" 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 |