From c30e46438896375b00c86752fe8e1d39a15cf252 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Tue, 22 Sep 2015 09:25:38 -0400 Subject: [PATCH] Additional tweaks to callback output for delegate_to --- lib/ansible/plugins/callback/default.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/ansible/plugins/callback/default.py b/lib/ansible/plugins/callback/default.py index a936e421bd5..d48a04d9b99 100644 --- a/lib/ansible/plugins/callback/default.py +++ b/lib/ansible/plugins/callback/default.py @@ -50,7 +50,10 @@ class CallbackModule(CallbackBase): if result._task.loop and 'results' in result._result: self._process_items(result) 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: self._display.display("...ignoring", color='cyan') @@ -62,13 +65,13 @@ class CallbackModule(CallbackBase): color = 'cyan' elif result._result.get('changed', False): 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: msg = "changed: [%s]" % result._host.get_name() color = 'yellow' else: 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: msg = "ok: [%s]" % result._host.get_name() color = 'green' @@ -91,7 +94,10 @@ class CallbackModule(CallbackBase): self._display.display(msg, color='cyan') 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): self._display.display("skipping: no hosts matched", color='cyan')