ensure fullpaths on vars files (#24990)

fixes #24970
now correctly picks up group/host vars inside group/host named directories
pull/24731/head
Brian Coca 8 years ago committed by Adrian Likins
parent 0d761e4568
commit 40b222867f

@ -99,10 +99,11 @@ class VarsModule(BaseVarsPlugin):
if os.path.isdir(full_path): if os.path.isdir(full_path):
# matched dir name, so use all files included recursively # matched dir name, so use all files included recursively
for spath in os.listdir(full_path): for spath in os.listdir(full_path):
if os.path.isdir(spath): full_spath = os.path.join(full_path, spath)
found.extend(self._find_vars_files(spath, name)) if os.path.isdir(full_spath):
found.extend(self._find_vars_files(full_spath, ''))
else: else:
found.append(spath) found.append(full_spath)
else: else:
found.append(full_path) found.append(full_path)
return found return found

Loading…
Cancel
Save