From 83f4f162357729ddbee81557fb6cc938092d8495 Mon Sep 17 00:00:00 2001 From: Jonathan Mainguy Date: Fri, 23 Oct 2015 13:19:10 -0400 Subject: [PATCH] Enable stdout and stderr on sucessful runs, making show_diff useable omit color symbols as ansible makes them illegible --- system/puppet.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/puppet.py b/system/puppet.py index 98b09bb3f90..5bddfd49283 100644 --- a/system/puppet.py +++ b/system/puppet.py @@ -171,8 +171,8 @@ def main(): if not p['manifest']: cmd = ("%(base_cmd)s agent --onetime" - " --ignorecache --no-daemonize --no-usecacheonfailure" - " --no-splay --detailed-exitcodes --verbose") % dict( + " --ignorecache --no-daemonize --no-usecacheonfailure --no-splay" + " --detailed-exitcodes --verbose --color 0") % dict( base_cmd=base_cmd, ) if p['puppetmaster']: @@ -198,7 +198,7 @@ def main(): if rc == 0: # success - module.exit_json(rc=rc, changed=False, stdout=stdout) + module.exit_json(rc=rc, changed=False, stdout=stdout, stderr=stderr) elif rc == 1: # rc==1 could be because it's disabled # rc==1 could also mean there was a compilation failure