ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-27 07:01:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Add support for relative paths in the file lookup plugin for roles

Browse source 
Fixes #7628
This commit is contained in:
James Cammarata 2014-06-04 15:20:59 -05:00
commit ad97c618cf
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/ansible/runner/lookup_plugins/file.py
View file

@ -35,11 +35,25 @@ class LookupModule(object):
terms = [ terms ] terms = [ terms ]
for term in terms: for term in terms:
path = utils.path_dwim(self.basedir, term) basedir_path = utils.path_dwim(self.basedir, term)
if not os.path.exists(path): relative_path = None
raise errors.AnsibleError("%s does not exist" % path) playbook_path = None
# Special handling of the file lookup, used primarily when the
# lookup is done from a role. If the file isn't found in the
# basedir of the current file, use dwim_relative to look in the
# role/files/ directory, and finally the playbook directory
# itself (which will be relative to the current working dir)
if '_original_file' in inject:
relative_path = utils.path_dwim_relative(inject['_original_file'], 'files', term, self.basedir, check=False)
if 'playbook_dir' in inject:
playbook_path = os.path.join(inject['playbook_dir'], term)
for path in (basedir_path, relative_path, playbook_path):
if path and os.path.exists(path):
ret.append(codecs.open(path, encoding="utf8").read().rstrip()) ret.append(codecs.open(path, encoding="utf8").read().rstrip())
break
else:
raise errors.AnsibleError("could not locate file in lookup: %s" % term)
return ret return ret