cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1207 from dagwieers/gather_facts-fix

Browse source 
Fix gather_facts assumption that SETUP_CACHE for a host is empty
This commit is contained in:
Michael DeHaan 2012-10-02 19:05:54 -07:00
commit 212296e59c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/playbook/__init__.py
View file

@ -312,7 +312,7 @@ class PlayBook(object):
if play.gather_facts is False: if play.gather_facts is False:
return {} return {}
elif play.gather_facts is None: elif play.gather_facts is None:
host_list = [h for h in host_list if h not in self.SETUP_CACHE] 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: if len(host_list) == 0:
return {} return {}
@ -335,6 +335,7 @@ class PlayBook(object):
# let runner template out future commands # let runner template out future commands
setup_ok = setup_results.get('contacted', {}) setup_ok = setup_results.get('contacted', {})
for (host, result) in setup_ok.iteritems(): for (host, result) in setup_ok.iteritems():
self.SETUP_CACHE[host].update({'module_setup': True})
self.SETUP_CACHE[host].update(result.get('ansible_facts', {})) self.SETUP_CACHE[host].update(result.get('ansible_facts', {}))
return setup_results return setup_results