Enable stdout and stderr on sucessful runs, making show_diff useable

omit color symbols as ansible makes them illegible
reviewable/pr18780/r1
Jonathan Mainguy 9 years ago
parent 0f2b2030ce
commit 83f4f16235

@ -171,8 +171,8 @@ def main():
if not p['manifest']: if not p['manifest']:
cmd = ("%(base_cmd)s agent --onetime" cmd = ("%(base_cmd)s agent --onetime"
" --ignorecache --no-daemonize --no-usecacheonfailure" " --ignorecache --no-daemonize --no-usecacheonfailure --no-splay"
" --no-splay --detailed-exitcodes --verbose") % dict( " --detailed-exitcodes --verbose --color 0") % dict(
base_cmd=base_cmd, base_cmd=base_cmd,
) )
if p['puppetmaster']: if p['puppetmaster']:
@ -198,7 +198,7 @@ def main():
if rc == 0: if rc == 0:
# success # success
module.exit_json(rc=rc, changed=False, stdout=stdout) module.exit_json(rc=rc, changed=False, stdout=stdout, stderr=stderr)
elif rc == 1: elif rc == 1:
# rc==1 could be because it's disabled # rc==1 could be because it's disabled
# rc==1 could also mean there was a compilation failure # rc==1 could also mean there was a compilation failure

Loading…
Cancel
Save