This commit is contained in:
Mitchell Hashimoto 2013-12-11 13:43:59 -08:00
parent 8e617d006b
commit 962cedd04c
1 changed files with 12 additions and 12 deletions

View File

@ -48,12 +48,12 @@ type Provisioner struct {
}
type ExecuteTemplate struct {
FacterVars string
HieraConfigPath string
ModulePath string
ManifestFile string
ManifestDir string
Sudo bool
FacterVars string
HieraConfigPath string
ModulePath string
ManifestFile string
ManifestDir string
Sudo bool
}
func (p *Provisioner) Prepare(raws ...interface{}) error {
@ -259,12 +259,12 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
// Execute Puppet
command, err := p.config.tpl.Process(p.config.ExecuteCommand, &ExecuteTemplate{
FacterVars: strings.Join(facterVars, " "),
HieraConfigPath: remoteHieraConfigPath,
ManifestDir: remoteManifestDir,
ManifestFile: remoteManifestFile,
ModulePath: strings.Join(modulePaths, ":"),
Sudo: !p.config.PreventSudo,
FacterVars: strings.Join(facterVars, " "),
HieraConfigPath: remoteHieraConfigPath,
ManifestDir: remoteManifestDir,
ManifestFile: remoteManifestFile,
ModulePath: strings.Join(modulePaths, ":"),
Sudo: !p.config.PreventSudo,
})
if err != nil {
return err