Commit 873bc747 authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

Merge pull request #2280 from flopex/ignore_exit_codes

provisioner/puppet-server: Add ignore exit codes option
parents c3b10ba1 758618ec
...@@ -41,6 +41,10 @@ type Config struct { ...@@ -41,6 +41,10 @@ type Config struct {
// The directory where files will be uploaded. Packer requires write // The directory where files will be uploaded. Packer requires write
// permissions in this directory. // permissions in this directory.
StagingDir string `mapstructure:"staging_dir"` StagingDir string `mapstructure:"staging_dir"`
// If true, packer will ignore all exit-codes from a puppet run
IgnoreExitCodes bool `mapstructure:"ignore_exit_codes"`
} }
type Provisioner struct { type Provisioner struct {
...@@ -163,7 +167,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error { ...@@ -163,7 +167,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
return err return err
} }
if cmd.ExitStatus != 0 && cmd.ExitStatus != 2 { if cmd.ExitStatus != 0 && cmd.ExitStatus != 2 && !p.config.IgnoreExitCodes {
return fmt.Errorf("Puppet exited with a non-zero exit status: %d", cmd.ExitStatus) return fmt.Errorf("Puppet exited with a non-zero exit status: %d", cmd.ExitStatus)
} }
......
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