internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplified and normalized lookup search path behaviour

Browse Source
This commit is contained in:
Brian Coca
2015-07-22 22:32:18 -04:00
parent 857f584ebf
commit b678b9828c
3 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ansible/plugins/lookup/csvfile.py
View File

@@ -46,6 +46,12 @@ class LookupModule(LookupBase):
terms = [ terms ]
ret = []
if 'role_path' in variables:
basedir = variables['role_path']
else:
basedir = self._loader.get_basedir()
for term in terms:
params = term.split()
key = params[0]
@@ -69,9 +75,8 @@ class LookupModule(LookupBase):
if paramvals['delimiter'] == 'TAB':
paramvals['delimiter'] = "\t"
path = self._loader.path_dwim(paramvals['file'])
var = self.read_csv(path, key, paramvals['delimiter'], paramvals['default'], paramvals['col'])
lookupfile = self._loader.path_dwim_relative(basedir, 'files', term)
var = self.read_csv(lookupfile, key, paramvals['delimiter'], paramvals['default'], paramvals['col'])
if var is not None:
if type(var) is list:
for v in var: