From d6cafff2f95f3cf2f8c6532da67170b535da2816 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Mon, 27 Jul 2015 16:35:27 -0400 Subject: [PATCH] Additional changes to fix fileglob relative path lookups --- lib/ansible/plugins/lookup/fileglob.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/ansible/plugins/lookup/fileglob.py b/lib/ansible/plugins/lookup/fileglob.py index 9747381ca12..7889e6e5bcf 100644 --- a/lib/ansible/plugins/lookup/fileglob.py +++ b/lib/ansible/plugins/lookup/fileglob.py @@ -30,7 +30,8 @@ class LookupModule(LookupBase): ret = [] for term in terms: - dwimmed = self._loader.path_dwim_relative(basedir, 'files', term) - globbed = glob.glob(dwimmed) + term_file = os.path.basename(term) + dwimmed_path = self._loader.path_dwim_relative(basedir, 'files', os.path.dirname(term)) + globbed = glob.glob(os.path.join(dwimmed_path, term_file)) ret.extend(g for g in globbed if os.path.isfile(g)) return ret