Fix Puppet Provisioner crash when HieraConfigPath or ManifestDir is specified

Prevents the following error,
Build 'amazon-instance' errored: template: tpl11:1:103: executing "tpl11" at <.HieraConfigPath>: HieraConfigPath has arguments but cannot be invoked as function
This commit is contained in:
Sudharshan S 2013-12-18 19:33:43 +05:30
parent f99837b4b7
commit e8d1cc8e31
1 changed files with 2 additions and 2 deletions

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}}"
}