Path of group_vars and host_vars were getting the basedir added twice.

Fix inventory so this won't happen and fix DataLoader so that it will
test relative paths relative to self._basedir

Fixes #11789
This commit is contained in:
Toshio Kuratomi 2015-08-05 17:38:38 -07:00
parent e7b5cb8782
commit bae7a02be5
3 changed files with 12 additions and 4 deletions

View file

@ -29,11 +29,11 @@ class DictDataLoader(DataLoader):
def __init__(self, file_mapping=dict()):
assert type(file_mapping) == dict
super(DictDataLoader, self).__init__()
self._file_mapping = file_mapping
self._build_known_directories()
super(DictDataLoader, self).__init__()
def load_from_file(self, path):
if path in self._file_mapping:
return self.load(self._file_mapping[path], path)