From 770032648abc35da3183c6c8ec8f8b8e41ab990b Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Fri, 9 Oct 2015 10:53:38 -0400 Subject: [PATCH] Show -> localhost for local_action tasks --- lib/ansible/plugins/callback/default.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/lib/ansible/plugins/callback/default.py b/lib/ansible/plugins/callback/default.py index 42bd64436fa..2969d005261 100644 --- a/lib/ansible/plugins/callback/default.py +++ b/lib/ansible/plugins/callback/default.py @@ -64,14 +64,22 @@ class CallbackModule(CallbackBase): msg = 'included: %s for %s' % (result._task.args.get('_raw_params'), result._host.name) 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) + if result._task.delegate_to is not None or result._task._local_action: + if result._task._local_action: + target = 'localhost' + else: + target = result._task.delegate_to + msg = "changed: [%s -> %s]" % (result._host.get_name(), target) 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) + if result._task.delegate_to is not None or result._task._local_action: + if result._task._local_action: + target = 'localhost' + else: + target = result._task.delegate_to + msg = "ok: [%s -> %s]" % (result._host.get_name(), target) else: msg = "ok: [%s]" % result._host.get_name() color = 'green' @@ -97,8 +105,12 @@ class CallbackModule(CallbackBase): self._display.display(msg, color='cyan') def v2_runner_on_unreachable(self, result): - 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') + if result._task.delegate_to or result._task._local_action: + if result._task._local_action: + target = 'localhost' + else: + target = result._task.delegate_to + self._display.display("fatal: [%s -> %s]: UNREACHABLE! => %s" % (result._host.get_name(), target, 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')