Merge "Honor show-diff options with puppet apply"

2016-08-05 20:03:36 +00:00 · 2016-08-05 20:03:36 +00:00 · ede55a8691
commit ede55a8691
parent 77bde8611e 92737dfe27
1 changed files with 2 additions and 0 deletions
--- a/library/puppet
+++ b/library/puppet
@ -197,6 +197,8 @@ def main():
        cmd = "%s apply --detailed-exitcodes " % base_cmd
        if p['logdest'] == 'syslog':
            cmd += "--logdest syslog "
+        if p['show_diff']:
+            cmd += "--show_diff "
        if p['environment']:
            cmd += "--environment '%s' " % p['environment']
        if module.check_mode: