Merge pull request #3971 from mitchellh/fix3486
change chef-solo provisioner staging directory
This commit is contained in:
commit
d8439b0034
|
@ -29,12 +29,12 @@ var guestOSTypeConfigs = map[string]guestOSTypeConfig{
|
||||||
provisioner.UnixOSType: guestOSTypeConfig{
|
provisioner.UnixOSType: guestOSTypeConfig{
|
||||||
executeCommand: "{{if .Sudo}}sudo {{end}}chef-solo --no-color -c {{.ConfigPath}} -j {{.JsonPath}}",
|
executeCommand: "{{if .Sudo}}sudo {{end}}chef-solo --no-color -c {{.ConfigPath}} -j {{.JsonPath}}",
|
||||||
installCommand: "curl -L https://omnitruck.chef.io/install.sh | {{if .Sudo}}sudo {{end}}bash",
|
installCommand: "curl -L https://omnitruck.chef.io/install.sh | {{if .Sudo}}sudo {{end}}bash",
|
||||||
stagingDir: "/tmp/packer-chef-client",
|
stagingDir: "/tmp/packer-chef-solo",
|
||||||
},
|
},
|
||||||
provisioner.WindowsOSType: guestOSTypeConfig{
|
provisioner.WindowsOSType: guestOSTypeConfig{
|
||||||
executeCommand: "c:/opscode/chef/bin/chef-solo.bat --no-color -c {{.ConfigPath}} -j {{.JsonPath}}",
|
executeCommand: "c:/opscode/chef/bin/chef-solo.bat --no-color -c {{.ConfigPath}} -j {{.JsonPath}}",
|
||||||
installCommand: "powershell.exe -Command \". { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install\"",
|
installCommand: "powershell.exe -Command \". { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install\"",
|
||||||
stagingDir: "C:/Windows/Temp/packer-chef-client",
|
stagingDir: "C:/Windows/Temp/packer-chef-solo",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue