Merge pull request #415 from justinclayton/fix_smushed_facter_vars

provisioner/puppet-masterless: facter vars may collide with puppet command
pull/417/head
Mitchell Hashimoto 13 years ago
commit b295c1670e

@ -69,7 +69,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
// Set some defaults
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}}' " +
"{{if .HasHieraConfigPath}}--hiera_config='{{.HieraConfigPath}}' {{end}}" +
"--detailed-exitcodes " +

Loading…
Cancel
Save