ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-08-05 13:44:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fix first_found not finding files in roles (only templates)

Browse source
This commit is contained in:
Toshio Kuratomi 2015-11-09 13:46:01 -08:00
commit db5d3f03a9
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/plugins/lookup/first_found.py
View file

@ -185,14 +185,13 @@ class LookupModule(LookupBase):
else: else:
if roledir is not None: if roledir is not None:
# check the templates and vars directories too,if they exist # check the templates and vars directories too,if they exist
for subdir in ('templates', 'vars'): for subdir in ('templates', 'vars', 'files'):
path = self._loader.path_dwim_relative(roledir, subdir, fn) path = self._loader.path_dwim_relative(roledir, subdir, fn)
if os.path.exists(path): if os.path.exists(path):
return [path] return [path]
# if none of the above were found, just check the # if none of the above were found, just check the
# current filename against the basedir (this will already # current filename against the current dir
# have ../files from runner, if it's a role task
path = self._loader.path_dwim(fn) path = self._loader.path_dwim(fn)
if os.path.exists(path): if os.path.exists(path):
return [path] return [path]