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

Fix up 'changed' playbook output patch

Browse source
This commit is contained in:
Michael DeHaan 2012-09-25 08:06:55 -04:00
parent 3270c097ef
commit 8e71b26264
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/callbacks.py
View file

@ -310,7 +310,7 @@ class PlaybookRunnerCallbacks(DefaultRunnerCallbacks):
host_result2 = host_result.copy() host_result2 = host_result.copy()
host_result2.pop('invocation', None) host_result2.pop('invocation', None)
changed = 'changed' in host_result2 or host_result['changed'] changed = host_result.get('changed', False)
ok_or_changed = 'ok' ok_or_changed = 'ok'
if changed: if changed:
ok_or_changed = 'changed' ok_or_changed = 'changed'
@ -319,7 +319,7 @@ class PlaybookRunnerCallbacks(DefaultRunnerCallbacks):
msg = '' msg = ''
if not self.verbose or host_result2.get("verbose_override",None) is not None: if not self.verbose or host_result2.get("verbose_override",None) is not None:
if item: if item:
msg = "ok: [%s] => (item=%s)" % (host, item) msg = "%s: [%s] => (item=%s)" % (ok_or_changed, host, item)
else: else:
if 'ansible_job_id' not in host_result or 'finished' in host_result: if 'ansible_job_id' not in host_result or 'finished' in host_result:
msg = "%s: [%s]" % (ok_or_changed, host) msg = "%s: [%s]" % (ok_or_changed, host)
@ -329,7 +329,7 @@ class PlaybookRunnerCallbacks(DefaultRunnerCallbacks):
msg = "%s: [%s] => (item=%s) => %s" % (ok_or_changed, host, item, utils.jsonify(host_result2)) msg = "%s: [%s] => (item=%s) => %s" % (ok_or_changed, host, item, utils.jsonify(host_result2))
else: else:
if 'ansible_job_id' not in host_result or 'finished' in host_result2: if 'ansible_job_id' not in host_result or 'finished' in host_result2:
msg = "%s: [%s] => %s" % (host, utils.jsonify(host_result2)) msg = "%s: [%s] => %s" % (ok_or_changed, host, utils.jsonify(host_result2))
if msg != '': if msg != '':
if not changed: if not changed: