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

Merge pull request #1081 from dsummersl/changelabel

Browse source 
Modified 'ok' to 'changed' when a change has occured
This commit is contained in:
Michael DeHaan 2012-09-24 13:46:06 -07:00
commit b355dca7dd
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/callbacks.py
View file

@ -310,25 +310,29 @@ 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']
ok_or_changed = 'ok'
if changed:
ok_or_changed = 'changed'
# show verbose output for non-setup module results if --verbose is used # show verbose output for non-setup module results if --verbose is used
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 = "ok: [%s] => (item=%s)" % (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 = "ok: [%s]" % (host) msg = "%s: [%s]" % (ok_or_changed, host)
else: else:
# verbose ... # verbose ...
if item: if item:
msg = "ok: [%s] => (item=%s) => %s" % (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 = "ok: [%s] => %s" % (host, utils.jsonify(host_result2)) msg = "%s: [%s] => %s" % (host, utils.jsonify(host_result2))
if msg != '': if msg != '':
if not 'changed' in host_result2 or not host_result['changed']: if not changed:
print stringc(msg, 'green') print stringc(msg, 'green')
else: else:
print stringc(msg, 'yellow') print stringc(msg, 'yellow')