diff options
| author | James Cammarata <jimi@sngx.net> | 2015-10-19 13:40:25 -0400 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2015-10-19 13:42:17 -0400 |
| commit | 1cfd941179a7ffd11f35ac2106311c87cc7c67ba (patch) | |
| tree | ead0d60740adcf9f62de4debcc839db7581911b9 /lib | |
| parent | dc33d30c6da0ddd5a4c20b16af5c7766303d4cb0 (diff) | |
| download | ansible-1cfd941179a7ffd11f35ac2106311c87cc7c67ba.tar.gz | |
Adding a v2 callback for task includes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ansible/plugins/callback/__init__.py | 4 | ||||
| -rw-r--r-- | lib/ansible/plugins/callback/default.py | 15 |
2 files changed, 13 insertions, 6 deletions
diff --git a/lib/ansible/plugins/callback/__init__.py b/lib/ansible/plugins/callback/__init__.py index fff0a6dc56..c75cc3d710 100644 --- a/lib/ansible/plugins/callback/__init__.py +++ b/lib/ansible/plugins/callback/__init__.py @@ -292,3 +292,7 @@ class CallbackBase: def v2_playbook_on_item_skipped(self, result): pass # no v1 + + def v2_playbook_on_include(self, included_file): + pass #no v1 correspondance + diff --git a/lib/ansible/plugins/callback/default.py b/lib/ansible/plugins/callback/default.py index 2969d00526..f6ba1fe426 100644 --- a/lib/ansible/plugins/callback/default.py +++ b/lib/ansible/plugins/callback/default.py @@ -61,8 +61,7 @@ class CallbackModule(CallbackBase): def v2_runner_on_ok(self, result): if result._task.action == 'include': - msg = 'included: %s for %s' % (result._task.args.get('_raw_params'), result._host.name) - color = 'cyan' + return elif result._result.get('changed', False): if result._task.delegate_to is not None or result._task._local_action: if result._task._local_action: @@ -88,7 +87,7 @@ class CallbackModule(CallbackBase): self._process_items(result) else: - if (self._display.verbosity > 0 or '_ansible_verbose_always' in result._result) and not '_ansible_verbose_override' in result._result and result._task.action != 'include': + if (self._display.verbosity > 0 or '_ansible_verbose_always' in result._result) and not '_ansible_verbose_override' in result._result: msg += " => %s" % (self._dump_results(result._result),) self._display.display(msg, color=color) @@ -149,8 +148,7 @@ class CallbackModule(CallbackBase): def v2_playbook_item_on_ok(self, result): if result._task.action == 'include': - msg = 'included: %s for %s' % (result._task.args.get('_raw_params'), result._host.name) - color = 'cyan' + return elif result._result.get('changed', False): msg = "changed: [%s]" % result._host.get_name() color = 'yellow' @@ -160,7 +158,7 @@ class CallbackModule(CallbackBase): msg += " => (item=%s)" % (result._result['item'],) - if (self._display.verbosity > 0 or '_ansible_verbose_always' in result._result) and not '_ansible_verbose_override' in result._result and result._task.action != 'include': + if (self._display.verbosity > 0 or '_ansible_verbose_always' in result._result) and not '_ansible_verbose_override' in result._result: msg += " => %s" % self._dump_results(result._result) self._display.display(msg, color=color) @@ -187,3 +185,8 @@ class CallbackModule(CallbackBase): msg += " => %s" % self._dump_results(result._result) self._display.display(msg, color='cyan') + def v2_playbook_on_include(self, included_file): + msg = 'included: %s for %s' % (included_file._filename, ", ".join([h.name for h in included_file._hosts])) + color = 'cyan' + self._display.display(msg, color='cyan') + |