From c64119b53020215f815dc31b582bac96cf7598f8 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 24 Feb 2016 08:56:24 -0600
Subject: [PATCH] Sync with upstream ansible-modules-extras

The --show-diff option to puppet agent is show-diff, not show_diff.
Also, there is a doc string about which version logdest was added in.

These are not important for Infra. However, keeping in sync makes it
easier to track changes that might actually matter.

Change-Id: Id16b9d7510efa4b8f3645997617cd00ee870e83a
---
 library/puppet | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/puppet b/library/puppet
index 51464ca..c26b96d 100644
--- a/library/puppet
+++ b/library/puppet
@@ -73,6 +73,7 @@ options:
     required: false
     default: stdout
     choices: [ 'stdout', 'syslog' ]
+    version_added: "2.1"
 requirements: [ puppet ]
 author: "Monty Taylor (@emonty)"
 '''
@@ -185,7 +186,7 @@ def main():
         if p['puppetmaster']:
             cmd += " --server %s" % pipes.quote(p['puppetmaster'])
         if p['show_diff']:
-            cmd += " --show-diff"
+            cmd += " --show_diff"
         if p['environment']:
             cmd += " --environment '%s'" % p['environment']
         if module.check_mode: