Commit 87258f6d by Michael DeHaan

Resolve merge commit

parent 1c632af2
...@@ -437,10 +437,6 @@ class PlayBook(object): ...@@ -437,10 +437,6 @@ class PlayBook(object):
return {} return {}
host_list = self._list_available_hosts(play.hosts) host_list = self._list_available_hosts(play.hosts)
if play.gather_facts is None:
host_list = [h for h in host_list if h not in self.SETUP_CACHE or 'module_setup' not in self.SETUP_CACHE[h]]
if len(host_list) == 0:
return {}
self.callbacks.on_setup() self.callbacks.on_setup()
self.inventory.restrict_to(host_list) self.inventory.restrict_to(host_list)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment