From ed4acbc9033f40772bad07edc22e6f6ecdb72027 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 19 Jun 2015 06:09:22 +0200
Subject: [PATCH] update CHANGELOG

---
 CHANGELOG.md                                                 | 1 +
 website/source/docs/provisioners/puppet-server.html.markdown | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66c611975..70a976086 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,6 +81,7 @@ IMPROVEMENTS:
   * provisioner/puppet-masterless: `working_directory` option [GH-1831]
   * provisioner/puppet-masterless: `packer_build_name` and
       `packer_build_type` are default facts. [GH-1878]
+  * provisioner/puppet-server: `ignore_exit_codes` option added [GH-2280]
 
 BUG FIXES:
 
diff --git a/website/source/docs/provisioners/puppet-server.html.markdown b/website/source/docs/provisioners/puppet-server.html.markdown
index ecc33f36c..1cbc9c2d4 100644
--- a/website/source/docs/provisioners/puppet-server.html.markdown
+++ b/website/source/docs/provisioners/puppet-server.html.markdown
@@ -51,6 +51,9 @@ required. They are listed below:
 * `facter` (object of key/value strings) - Additional Facter facts to make available to the
   Puppet run.
 
+* `ignore_exit_codes` (bool) - If true, Packer will never consider the
+  provisioner a failure.
+
 * `options` (string) - Additional command line options to pass
   to `puppet agent` when Puppet is ran.