diff options
| author | James Cammarata <jimi@sngx.net> | 2015-07-27 10:41:28 -0400 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2015-07-27 10:41:28 -0400 |
| commit | ee835ff7adf05e53360c1210a592afa5cdebb268 (patch) | |
| tree | 2392f027dd27c149c81df2a2b8303e8cfb788770 /lib/ansible/plugins/lookup/fileglob.py | |
| parent | 3a4dd523d3649facc6d88d94cb67f5531a51af2a (diff) | |
| download | ansible-ee835ff7adf05e53360c1210a592afa5cdebb268.tar.gz | |
Add a base-level get_basedir method for lookup plugins and fix relative lookups
Fixes #11746
Diffstat (limited to 'lib/ansible/plugins/lookup/fileglob.py')
| -rw-r--r-- | lib/ansible/plugins/lookup/fileglob.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ansible/plugins/lookup/fileglob.py b/lib/ansible/plugins/lookup/fileglob.py index 8985906715..9747381ca1 100644 --- a/lib/ansible/plugins/lookup/fileglob.py +++ b/lib/ansible/plugins/lookup/fileglob.py @@ -26,9 +26,11 @@ class LookupModule(LookupBase): def run(self, terms, variables=None, **kwargs): + basedir = self.get_basedir(variables) + ret = [] for term in terms: - dwimmed = self._loader.path_dwim(term) + dwimmed = self._loader.path_dwim_relative(basedir, 'files', term) globbed = glob.glob(dwimmed) ret.extend(g for g in globbed if os.path.isfile(g)) return ret |