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

Merge pull request #2570 from svanharmelen/b-provisioner-chef-version 

provisioner/chef: fixes issue #2568
This commit is contained in:
Sander van Harmelen 2015-06-30 14:35:04 +02:00
parent 282e139334 3d03f4b2aa
commit 57980349fc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ func (p *Provisioner) linuxInstallChefClient(
}
// Then execute the install.sh scrip to download and install Chef Client
err = p.runCommand(o, comm, fmt.Sprintf("%sbash ./install.sh -v %s", prefix, p.Version))
err = p.runCommand(o, comm, fmt.Sprintf("%sbash ./install.sh -v %q", prefix, p.Version))
if err != nil {
return err
}

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

@ -24,7 +24,7 @@ func TestResourceProvider_linuxInstallChefClient(t *testing.T) {
Commands: map[string]bool{
"sudo curl -LO https://www.chef.io/chef/install.sh": true,
"sudo bash ./install.sh -v ": true,
"sudo bash ./install.sh -v \"\"": true,
"sudo rm -f install.sh": true,
},
},
@ -41,7 +41,7 @@ func TestResourceProvider_linuxInstallChefClient(t *testing.T) {
Commands: map[string]bool{
"curl -LO https://www.chef.io/chef/install.sh": true,
"bash ./install.sh -v ": true,
"bash ./install.sh -v \"\"": true,
"rm -f install.sh": true,
},
},
@ -59,7 +59,7 @@ func TestResourceProvider_linuxInstallChefClient(t *testing.T) {
Commands: map[string]bool{
"proxy_http='http://proxy.local' curl -LO https://www.chef.io/chef/install.sh": true,
"proxy_http='http://proxy.local' bash ./install.sh -v ": true,
"proxy_http='http://proxy.local' bash ./install.sh -v \"\"": true,
"proxy_http='http://proxy.local' rm -f install.sh": true,
},
},
@ -80,7 +80,7 @@ func TestResourceProvider_linuxInstallChefClient(t *testing.T) {
"proxy_http='http://proxy.local' no_proxy='http://local.local,http://local.org' " +
"curl -LO https://www.chef.io/chef/install.sh": true,
"proxy_http='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' " +
"rm -f install.sh": true,
},
@ -99,7 +99,7 @@ func TestResourceProvider_linuxInstallChefClient(t *testing.T) {
Commands: map[string]bool{
"curl -LO https://www.chef.io/chef/install.sh": true,
"bash ./install.sh -v 11.18.6": true,
"bash ./install.sh -v \"11.18.6\"": true,
"rm -f install.sh": true,
},
},