diff options
| author | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-08-05 17:38:38 -0700 |
|---|---|---|
| committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-08-05 17:41:17 -0700 |
| commit | bae7a02be589e26fc8c481380d1374927701099a (patch) | |
| tree | 789b52e0d817fb95453a9b84217c4cd735f13c7f | |
| parent | e7b5cb87828a49cfc8771ab3d83fda157d42972f (diff) | |
| download | ansible-fix-group_vars_path.tar.gz | |
Path of group_vars and host_vars were getting the basedir added twice.fix-group_vars_path
Fix inventory so this won't happen and fix DataLoader so that it will
test relative paths relative to self._basedir
Fixes #11789
| -rw-r--r-- | lib/ansible/inventory/__init__.py | 8 | ||||
| -rw-r--r-- | lib/ansible/parsing/__init__.py | 4 | ||||
| -rw-r--r-- | test/units/mock/loader.py | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/lib/ansible/inventory/__init__.py b/lib/ansible/inventory/__init__.py index 2bcea0f351..0e5f23099d 100644 --- a/lib/ansible/inventory/__init__.py +++ b/lib/ansible/inventory/__init__.py @@ -640,6 +640,7 @@ class Inventory(object): else: basedirs = [self._playbook_basedir] + cur_loader_basedir = self._loader.get_basedir() for basedir in basedirs: # this can happen from particular API usages, particularly if not run @@ -660,13 +661,16 @@ class Inventory(object): # FIXME: these should go to VariableManager if group and host is None: # load vars in dir/group_vars/name_of_group - base_path = os.path.join(basedir, "group_vars/%s" % group.name) + self._loader.set_basedir(basedir) + base_path = os.path.join("group_vars", group.name) results = self._variable_manager.add_group_vars_file(base_path, self._loader) elif host and group is None: # same for hostvars in dir/host_vars/name_of_host - base_path = os.path.join(basedir, "host_vars/%s" % host.name) + self._loader.set_basedir(basedir) + base_path = os.path.join("host_vars", host.name) results = self._variable_manager.add_host_vars_file(base_path, self._loader) + self._loader.set_basedir(cur_loader_basedir) # all done, results is a dictionary of variables for this particular host. return results diff --git a/lib/ansible/parsing/__init__.py b/lib/ansible/parsing/__init__.py index a7d414c043..749a386572 100644 --- a/lib/ansible/parsing/__init__.py +++ b/lib/ansible/parsing/__init__.py @@ -112,15 +112,19 @@ class DataLoader(): return parsed_data def path_exists(self, path): + path = self.path_dwim(path) return os.path.exists(path) def is_file(self, path): + path = self.path_dwim(path) return os.path.isfile(path) def is_directory(self, path): + path = self.path_dwim(path) return os.path.isdir(path) def list_directory(self, path): + path = self.path_dwim(path) return os.listdir(path) def _safe_load(self, stream, file_name=None): diff --git a/test/units/mock/loader.py b/test/units/mock/loader.py index f44df2efdb..0902193eeb 100644 --- a/test/units/mock/loader.py +++ b/test/units/mock/loader.py @@ -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) |