Commit 6b730b0f authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

Merge pull request #415 from justinclayton/fix_smushed_facter_vars

provisioner/puppet-masterless: facter vars may collide with puppet command
parents 3163d785 cd2280f3
...@@ -69,7 +69,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error { ...@@ -69,7 +69,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
// Set some defaults // Set some defaults
if p.config.ExecuteCommand == "" { if p.config.ExecuteCommand == "" {
p.config.ExecuteCommand = "{{.FacterVars}}{{if .Sudo}} sudo -E {{end}}" + p.config.ExecuteCommand = "{{.FacterVars}} {{if .Sudo}} sudo -E {{end}}" +
"puppet apply --verbose --modulepath='{{.ModulePath}}' " + "puppet apply --verbose --modulepath='{{.ModulePath}}' " +
"{{if .HasHieraConfigPath}}--hiera_config='{{.HieraConfigPath}}' {{end}}" + "{{if .HasHieraConfigPath}}--hiera_config='{{.HieraConfigPath}}' {{end}}" +
"--detailed-exitcodes " + "--detailed-exitcodes " +
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment