From 948f95575889530d26f1fc71473a0f33aa6180fb Mon Sep 17 00:00:00 2001 From: c22 Date: Thu, 14 Sep 2017 11:09:13 +1000 Subject: [PATCH] Fix regression bug reported in #5339 --- provisioner/puppet-masterless/provisioner.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provisioner/puppet-masterless/provisioner.go b/provisioner/puppet-masterless/provisioner.go index 1c4ad3bc1..1231dffab 100644 --- a/provisioner/puppet-masterless/provisioner.go +++ b/provisioner/puppet-masterless/provisioner.go @@ -79,7 +79,7 @@ var guestOSTypeConfigs = map[string]guestOSTypeConfig{ stagingDir: "/tmp/packer-puppet-masterless", executeCommand: "cd {{.WorkingDir}} && " + "{{.FacterVars}} {{if .Sudo}} sudo -E {{end}}" + - "puppet apply --verbose --modulepath='{{.ModulePath}}' " + + "{{if ne .PuppetBinDir \"\"}}{{.PuppetBinDir}}/{{end}}puppet apply --verbose --modulepath='{{.ModulePath}}' " + "{{if ne .HieraConfigPath \"\"}}--hiera_config='{{.HieraConfigPath}}' {{end}}" + "{{if ne .ManifestDir \"\"}}--manifestdir='{{.ManifestDir}}' {{end}}" + "--detailed-exitcodes " + @@ -92,7 +92,7 @@ var guestOSTypeConfigs = map[string]guestOSTypeConfig{ stagingDir: "C:/Windows/Temp/packer-puppet-masterless", executeCommand: "cd {{.WorkingDir}} && " + "{{.FacterVars}} && " + - "puppet apply --verbose --modulepath='{{.ModulePath}}' " + + "{{if ne .PuppetBinDir \"\"}}{{.PuppetBinDir}}/{{end}}puppet apply --verbose --modulepath='{{.ModulePath}}' " + "{{if ne .HieraConfigPath \"\"}}--hiera_config='{{.HieraConfigPath}}' {{end}}" + "{{if ne .ManifestDir \"\"}}--manifestdir='{{.ManifestDir}}' {{end}}" + "--detailed-exitcodes " +