ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-28 11:10:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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

14
lib/ansible/runner.py
View file

@ -320,9 +320,9 @@ class Runner(object):
''' allows discovered variables to be used in templates and action statements '''
host = conn.host
try:
var_result = utils.parse_json(result)
except:
if 'ansible_facts' in result:
var_result = result['ansible_facts']
else:
var_result = {}
# note: do not allow variables from playbook to be stomped on
@ -349,10 +349,12 @@ class Runner(object):
if module_name == 'setup':
self._add_result_to_setup_cache(conn, result)
if self.is_playbook:
self._save_setup_result_to_disk(conn, result)
(host, ok, data, err) = self._return_from_module(conn, host, result, err, executed)
return self._return_from_module(conn, host, result, err, executed)
if ok:
self._add_result_to_setup_cache(conn, data)
return (host, ok, data, err)
# *****************************************************