From 0da06eff5ccd89ee2014f6a876fc0a478f3ba924 Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Mon, 3 Mar 2014 16:01:10 +0100 Subject: [PATCH] Fix regression causing setup to run for every play This patch makes sure setup only runs once, unless it is enforced on a play. --- lib/ansible/playbook/__init__.py | 7 +++++-- lib/ansible/playbook/play.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/ansible/playbook/__init__.py b/lib/ansible/playbook/__init__.py index 65965526251..83e80e931f2 100644 --- a/lib/ansible/playbook/__init__.py +++ b/lib/ansible/playbook/__init__.py @@ -475,10 +475,13 @@ class PlayBook(object): def _do_setup_step(self, play): ''' get facts from the remote system ''' + host_list = self._trim_unavailable_hosts(play._play_hosts) if play.gather_facts is False: return {} - - host_list = self._trim_unavailable_hosts(play._play_hosts) + elif 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.inventory.restrict_to(host_list) diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py index 5ea31b526ce..a5eb0ed9851 100644 --- a/lib/ansible/playbook/play.py +++ b/lib/ansible/playbook/play.py @@ -117,7 +117,7 @@ class Play(object): self.sudo = ds.get('sudo', self.playbook.sudo) self.sudo_user = ds.get('sudo_user', self.playbook.sudo_user) self.transport = ds.get('connection', self.playbook.transport) - self.gather_facts = ds.get('gather_facts', True) + self.gather_facts = ds.get('gather_facts', None) self.remote_port = self.remote_port self.any_errors_fatal = utils.boolean(ds.get('any_errors_fatal', 'false')) self.accelerate = utils.boolean(ds.get('accelerate', 'false'))