ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the http_proxy

This commit is contained in:
Jeroen de Korte 2015-07-03 15:04:58 +02:00
parent 03dc6c4879
commit 007ab6e503
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/provisioners/chef/linux_provisioner.go
View File

@ -20,7 +20,7 @@ func (p *Provisioner) linuxInstallChefClient(
// Build up the command prefix // Build up the command prefix
prefix := "" prefix := ""
if p.HTTPProxy != "" { if p.HTTPProxy != "" {
prefix += fmt.Sprintf("proxy_http='%s' ", p.HTTPProxy) prefix += fmt.Sprintf("http_proxy='%s' ", p.HTTPProxy)
} }
if p.NOProxy != nil { if p.NOProxy != nil {
prefix += fmt.Sprintf("no_proxy='%s' ", strings.Join(p.NOProxy, ",")) prefix += fmt.Sprintf("no_proxy='%s' ", strings.Join(p.NOProxy, ","))

12
builtin/provisioners/chef/linux_provisioner_test.go
View File

@ -58,9 +58,9 @@ func TestResourceProvider_linuxInstallChefClient(t *testing.T) {
}), }),
Commands: map[string]bool{ Commands: map[string]bool{
"proxy_http='http://proxy.local' curl -LO https://www.chef.io/chef/install.sh": true, "http_proxy='http://proxy.local' curl -LO https://www.chef.io/chef/install.sh": true,
"proxy_http='http://proxy.local' bash ./install.sh -v \"\"": true, "http_proxy='http://proxy.local' bash ./install.sh -v \"\"": true,
"proxy_http='http://proxy.local' rm -f install.sh": true, "http_proxy='http://proxy.local' rm -f install.sh": true,
}, },
}, },
@ -77,11 +77,11 @@ func TestResourceProvider_linuxInstallChefClient(t *testing.T) {
}), }),
Commands: map[string]bool{ Commands: map[string]bool{
"proxy_http='http://proxy.local' no_proxy='http://local.local,http://local.org' " + "http_proxy='http://proxy.local' no_proxy='http://local.local,http://local.org' " +
"curl -LO https://www.chef.io/chef/install.sh": true, "curl -LO https://www.chef.io/chef/install.sh": true,
"proxy_http='http://proxy.local' no_proxy='http://local.local,http://local.org' " + "http_proxy='http://proxy.local' no_proxy='http://local.local,http://local.org' " +
"bash ./install.sh -v \"\"": true, "bash ./install.sh -v \"\"": true,
"proxy_http='http://proxy.local' no_proxy='http://local.local,http://local.org' " + "http_proxy='http://proxy.local' no_proxy='http://local.local,http://local.org' " +
"rm -f install.sh": true, "rm -f install.sh": true,
}, },
}, },