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

Additional tweaks to callback output for delegate_to

Browse source
This commit is contained in:
James Cammarata 2015-09-22 09:25:38 -04:00
parent 513619867a
commit c30e464388
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/plugins/callback/default.py
View file

@ -50,7 +50,10 @@ class CallbackModule(CallbackBase):
if result._task.loop and 'results' in result._result: if result._task.loop and 'results' in result._result:
self._process_items(result) self._process_items(result)
else: else:
self._display.display("fatal: [%s]: FAILED! => %s" % (result._host.get_name(), self._dump_results(result._result)), color='red') if result._task.delegate_to:
self._display.display("fatal: [%s -> %s]: FAILED! => %s" % (result._host.get_name(), result._task.delegate_to, self._dump_results(result._result)), color='red')
else:
self._display.display("fatal: [%s]: FAILED! => %s" % (result._host.get_name(), self._dump_results(result._result)), color='red')
if result._task.ignore_errors: if result._task.ignore_errors:
self._display.display("...ignoring", color='cyan') self._display.display("...ignoring", color='cyan')
@ -62,13 +65,13 @@ class CallbackModule(CallbackBase):
color = 'cyan' color = 'cyan'
elif result._result.get('changed', False): elif result._result.get('changed', False):
if result._task.delegate_to is not None: if result._task.delegate_to is not None:
msg = "changed: [%s => %s]" % (result._host.get_name(), result._task.delegate_to) msg = "changed: [%s -> %s]" % (result._host.get_name(), result._task.delegate_to)
else: else:
msg = "changed: [%s]" % result._host.get_name() msg = "changed: [%s]" % result._host.get_name()
color = 'yellow' color = 'yellow'
else: else:
if result._task.delegate_to is not None: if result._task.delegate_to is not None:
msg = "ok: [%s => %s]" % (result._host.get_name(), result._task.delegate_to) msg = "ok: [%s -> %s]" % (result._host.get_name(), result._task.delegate_to)
else: else:
msg = "ok: [%s]" % result._host.get_name() msg = "ok: [%s]" % result._host.get_name()
color = 'green' color = 'green'
@ -91,7 +94,10 @@ class CallbackModule(CallbackBase):
self._display.display(msg, color='cyan') self._display.display(msg, color='cyan')
def v2_runner_on_unreachable(self, result): def v2_runner_on_unreachable(self, result):
self._display.display("fatal: [%s]: UNREACHABLE! => %s" % (result._host.get_name(), self._dump_results(result._result)), color='red') if result._task.delegate_to:
self._display.display("fatal: [%s -> %s]: UNREACHABLE! => %s" % (result._host.get_name(), result._task.delegate_to, self._dump_results(result._result)), color='red')
else:
self._display.display("fatal: [%s]: UNREACHABLE! => %s" % (result._host.get_name(), self._dump_results(result._result)), color='red')
def v2_playbook_on_no_hosts_matched(self): def v2_playbook_on_no_hosts_matched(self):
self._display.display("skipping: no hosts matched", color='cyan') self._display.display("skipping: no hosts matched", color='cyan')