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

Allow with_first_files to search relative to templates and vars in roles

Browse source 
Fixes #8879
This commit is contained in:
James Cammarata 2014-09-18 15:53:41 -05:00
parent f7b5b85743
commit da5de725d7
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/runner/lookup_plugins/first_found.py
View file

@ -172,14 +172,21 @@ class LookupModule(object):
else:
total_search = terms
result = None
for fn in total_search:
if inject and '_original_file' in inject:
# check the templates and vars directories too,
# if they exist
for roledir in ('templates', 'vars'):
path = utils.path_dwim(os.path.join(self.basedir, '..', roledir), fn)
if os.path.exists(path):
return [path]
# if none of the above were found, just check the
# current filename against the basedir (this will already
# have ../files from runner, if it's a role task
path = utils.path_dwim(self.basedir, fn)
if os.path.exists(path):
return [path]
if not result:
else:
if skip:
return []
else: