diff options
author | Jonathan Mainguy <jon@soh.re> | 2015-10-23 13:19:10 -0400 |
---|---|---|
committer | Jonathan Mainguy <jon@soh.re> | 2015-12-15 11:36:55 -0500 |
commit | 83f4f162357729ddbee81557fb6cc938092d8495 (patch) | |
tree | 8ed9dee9fcd2a636f33070003270b4b1c8389188 | |
parent | 0f2b2030ce2a7fd470e177814197f415e2712247 (diff) | |
download | ansible-modules-extras-83f4f162357729ddbee81557fb6cc938092d8495.tar.gz |
Enable stdout and stderr on sucessful runs, making show_diff useable
omit color symbols as ansible makes them illegible
-rw-r--r-- | system/puppet.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/puppet.py b/system/puppet.py index 98b09bb3..5bddfd49 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 |