diff --git a/lib/ansible/plugins/callback/__init__.py b/lib/ansible/plugins/callback/__init__.py index 25bc1a72ac..5a8cb07492 100644 --- a/lib/ansible/plugins/callback/__init__.py +++ b/lib/ansible/plugins/callback/__init__.py @@ -200,10 +200,11 @@ class CallbackBase: self.runner_on_ok(host, result._result) def v2_runner_on_skipped(self, result): - host = result._host.get_name() - #FIXME, get item to pass through - item = None - self.runner_on_skipped(host, item) + if not C.DISPLAY_SKIPPED_HOSTS: + host = result._host.get_name() + #FIXME, get item to pass through + item = None + self.runner_on_skipped(host, item) def v2_runner_on_unreachable(self, result): host = result._host.get_name() diff --git a/lib/ansible/plugins/callback/default.py b/lib/ansible/plugins/callback/default.py index c963137968..081ca2e6e3 100644 --- a/lib/ansible/plugins/callback/default.py +++ b/lib/ansible/plugins/callback/default.py @@ -77,10 +77,11 @@ class CallbackModule(CallbackBase): self._handle_warnings(result._result) def v2_runner_on_skipped(self, result): - msg = "skipping: [%s]" % result._host.get_name() - 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='cyan') + if not C.DISPLAY_SKIPPED_HOSTS: + msg = "skipping: [%s]" % result._host.get_name() + 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='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') diff --git a/lib/ansible/plugins/strategies/__init__.py b/lib/ansible/plugins/strategies/__init__.py index 834569dd8a..5cfb80388f 100644 --- a/lib/ansible/plugins/strategies/__init__.py +++ b/lib/ansible/plugins/strategies/__init__.py @@ -22,7 +22,8 @@ __metaclass__ = type from six.moves import queue as Queue import time -from ansible.errors import * +from ansible import constants as C +from ansible.errors import AnsibleError, AnsibleParserError from ansible.executor.task_result import TaskResult from ansible.inventory.host import Host from ansible.inventory.group import Group