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

set_fact should put facts in the fact_cache, not vars_cache

Browse source 
Also fixes a template path lookup issue when using an include

Fixes #12277
This commit is contained in:
James Cammarata 2015-09-09 11:10:18 -04:00
parent e2e9319f06
commit 926f127245
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/executor/process/result.py
View file

@ -158,7 +158,7 @@ class ResultProcess(multiprocessing.Process):
elif 'ansible_facts' in result_item:
# if this task is registering facts, do that now
item = result_item.get('item', None)
if result._task.action in ('set_fact', 'include_vars'):
if result._task.action == 'include_vars':
for (key, value) in iteritems(result_item['ansible_facts']):
self._send_result(('set_host_var', result._host, result._task, item, key, value))
else:

23
lib/ansible/plugins/action/template.py
View file

@ -68,7 +68,28 @@ class ActionModule(ActionBase):
if source is None:
return dict(failed=True, msg="could not find src in first_available_file list")
else:
if self._task._role is not None:
if self._task._task_include is not None:
parent_include = self._task._task_include
while parent_include is not None:
parent_include_dir = self._templar.template(os.path.dirname(parent_include.args.get('_raw_params')))
while parent_include_dir:
if self._task._role:
new_basedir = os.path.join(self._task._role._role_path, 'tasks', parent_include_dir)
source = self._loader.path_dwim_relative(new_basedir, 'tasks', source)
else:
new_basedir = os.path.join(self._loader.get_basedir(), parent_include_dir)
source = self._loader.path_dwim_relative(new_basedir, 'templates', os.path.basename(source))
if os.path.exists(source):
break
else:
parent_include_dir = os.path.dirname(parent_include_dir)
if os.path.exists(source):
break
else:
parent_include = parent_include._task_include
elif self._task._role is not None:
source = self._loader.path_dwim_relative(self._task._role._role_path, 'templates', source)
else:
source = self._loader.path_dwim_relative(self._loader.get_basedir(), 'templates', source)