ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-02 06:30:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'custom-facts' of https://github.com/jhoekx/ansible into jhoekx-custom-facts

Browse source 
Conflicts:
	lib/ansible/runner.py
This commit is contained in:
Michael DeHaan 2012-04-23 21:24:52 -04:00
commit 49cca98f1e
6 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/playbook.py
View file

@ -397,6 +397,12 @@ class PlayBook(object):
module_args, module_vars, remote_user, async_seconds,
async_poll_interval, only_if, sudo, transport, port)
# add facts to the global setup cache
for host, result in results['contacted'].iteritems():
if "ansible_facts" in result:
for k,v in result['ansible_facts'].iteritems():
SETUP_CACHE[host][k]=v
self.stats.compute(results)
# if no hosts are matched, carry on, unlike /bin/ansible
@ -528,7 +534,8 @@ class PlayBook(object):
if vars_files is None:
# first pass only or we'll erase good work
for (host, result) in setup_ok.iteritems():
SETUP_CACHE[host] = result
if 'ansible_facts' in result:
SETUP_CACHE[host] = result['ansible_facts']
# *****************************************************