cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Enable stdout and stderr on sucessful runs, making show_diff useable

Browse source 
omit color symbols as ansible makes them illegible
This commit is contained in:
Jonathan Mainguy 2015-10-23 13:19:10 -04:00 committed by Matt Clay
parent 75b172c706
commit 4b948af706
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/extras/system/puppet.py
View file

@ -211,8 +211,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']:
@ -250,7 +250,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