From 5cb4b70e7e4e1df1d5ec680ddfd2fdbc2ac8a30f Mon Sep 17 00:00:00 2001 From: Jason Riddle Date: Wed, 13 Jan 2016 09:51:08 -0500 Subject: [PATCH 1/2] Add ENV['no_proxy'] to chef provisioner --- builtin/provisioners/chef/resource_provisioner.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/builtin/provisioners/chef/resource_provisioner.go b/builtin/provisioners/chef/resource_provisioner.go index 0e8c894d9fdd..34c6a5f1f0b6 100644 --- a/builtin/provisioners/chef/resource_provisioner.go +++ b/builtin/provisioners/chef/resource_provisioner.go @@ -60,7 +60,11 @@ ENV['https_proxy'] = "{{ .HTTPSProxy }}" ENV['HTTPS_PROXY'] = "{{ .HTTPSProxy }}" {{ end }} -{{ if .NOProxy }}no_proxy "{{ join .NOProxy "," }}"{{ end }} +{{ if .NOProxy }} +no_proxy "{{ join .NOProxy "," }}" +ENV['no_proxy'] = "{{ join .NOProxy "," }}" +{{ end }} + {{ if .SSLVerifyMode }}ssl_verify_mode {{ .SSLVerifyMode }}{{ end }} {{ if .DisableReporting }}enable_reporting false{{ end }} From ca39512fa74138ec580f1a4855fa073b56b0f61d Mon Sep 17 00:00:00 2001 From: Jason Riddle Date: Thu, 14 Jan 2016 13:51:23 -0500 Subject: [PATCH 2/2] Fix the failing chef provisioner test --- builtin/provisioners/chef/linux_provisioner_test.go | 4 +++- builtin/provisioners/chef/windows_provisioner_test.go | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/builtin/provisioners/chef/linux_provisioner_test.go b/builtin/provisioners/chef/linux_provisioner_test.go index b068df30ceef..89fae2b3f0c8 100644 --- a/builtin/provisioners/chef/linux_provisioner_test.go +++ b/builtin/provisioners/chef/linux_provisioner_test.go @@ -328,4 +328,6 @@ ENV['https_proxy'] = "https://proxy.local" ENV['HTTPS_PROXY'] = "https://proxy.local" -no_proxy "http://local.local,https://local.local"` + +no_proxy "http://local.local,https://local.local" +ENV['no_proxy'] = "http://local.local,https://local.local"` diff --git a/builtin/provisioners/chef/windows_provisioner_test.go b/builtin/provisioners/chef/windows_provisioner_test.go index 11e61d88839f..13604d6c920c 100644 --- a/builtin/provisioners/chef/windows_provisioner_test.go +++ b/builtin/provisioners/chef/windows_provisioner_test.go @@ -355,4 +355,6 @@ ENV['https_proxy'] = "https://proxy.local" ENV['HTTPS_PROXY'] = "https://proxy.local" -no_proxy "http://local.local,https://local.local"` + +no_proxy "http://local.local,https://local.local" +ENV['no_proxy'] = "http://local.local,https://local.local"`