Merge pull request #5498 from j2sol/exit_setup_early

Return early from setup step when possible
This commit is contained in:
Michael DeHaan 2014-01-04 10:47:35 -08:00
commit a3d90e8a87

View file

@ -433,11 +433,11 @@ class PlayBook(object):
def _do_setup_step(self, play):
''' get facts from the remote system '''
host_list = self._list_available_hosts(play.hosts)
if play.gather_facts is False:
return {}
elif play.gather_facts is None:
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 {}