iSharkFly-Docs/Packer-Cn
2
0
Fork 0
mirror of https://github.com/hashicorp/packer.git synced 2026-10-05 06:03:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #730 from sudharsh/txt_template_fix

Browse Source 
provisioner/puppet: fix crash when HieraConfigPath or ManifestDir is specified in the config file.
This commit is contained in:
Mitchell Hashimoto
2013-12-18 08:29:41 -08:00
parent a3878bbbd6 f5d3ea333a
commit d1fd7d10fb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
provisioner/puppet-masterless/provisioner.go
+2 -2
View File
@@ -75,8 +75,8 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
if p.config.ExecuteCommand == "" {
p.config.ExecuteCommand = "{{.FacterVars}} {{if .Sudo}} sudo -E {{end}}" +
"puppet apply --verbose --modulepath='{{.ModulePath}}' " +
"{{if .HieraConfigPath ne \"\"}}--hiera_config='{{.HieraConfigPath}}' {{end}}" +
"{{if .ManifestDir ne \"\"}}--manifestdir='{{.ManifestDir}}' {{end}}" +
"{{if ne .HieraConfigPath \"\"}}--hiera_config='{{.HieraConfigPath}}' {{end}}" +
"{{if ne .ManifestDir \"\"}}--manifestdir='{{.ManifestDir}}' {{end}}" +
"--detailed-exitcodes " +
"{{.ManifestFile}}"
}