ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 19:31:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Add basedir to ansible_search_path before running loops. Fixes #43302 (#43431)

Browse source
This commit is contained in:
Matt Martz 2018-07-31 10:51:32 -05:00 • committed by Brian Coca
parent 726c6eb889
commit a7f45c0660
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/executor/task_executor.py
View file

@ -202,6 +202,10 @@ class TaskExecutor:
# get search path for this task to pass to lookup plugins
self._job_vars['ansible_search_path'] = self._task.get_search_path()
# ensure basedir is always in (dwim already searches here but we need to display it)
if self._loader.get_basedir() not in self._job_vars['ansible_search_path']:
self._job_vars['ansible_search_path'].append(self._loader.get_basedir())
templar = Templar(loader=self._loader, shared_loader_obj=self._shared_loader_obj, variables=self._job_vars)
items = None
if self._task.loop_with:
@ -253,10 +257,6 @@ class TaskExecutor:
if item is not None and not isinstance(item, UnsafeProxy):
items[idx] = UnsafeProxy(item)
# ensure basedir is always in (dwim already searches here but we need to display it)
if self._loader.get_basedir() not in self._job_vars['ansible_search_path']:
self._job_vars['ansible_search_path'].append(self._loader.get_basedir())
return items
def _run_loop(self, items):