diff options
author | James Cammarata <jimi@sngx.net> | 2016-06-06 02:38:37 -0500 |
---|---|---|
committer | James Cammarata <jimi@sngx.net> | 2016-06-06 02:38:37 -0500 |
commit | e431e30cb47b4996046bb4dd78259d5ee9e255e9 (patch) | |
tree | 152d1c3b0659564c6505d492ebf020d92cb32ff3 /lib/ansible/inventory/__init__.py | |
parent | 6e48b32ab638ee56cfe35c82e217ef0465a209c6 (diff) | |
download | ansible-e431e30cb47b4996046bb4dd78259d5ee9e255e9.tar.gz |
Make sure we add host/group vars files when parsing inventoryissue_16117
Also fixes a bug where add_host was not adding the vars files
Fixes #16117
Diffstat (limited to 'lib/ansible/inventory/__init__.py')
-rw-r--r-- | lib/ansible/inventory/__init__.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ansible/inventory/__init__.py b/lib/ansible/inventory/__init__.py index b306bf255b..303a1fcb44 100644 --- a/lib/ansible/inventory/__init__.py +++ b/lib/ansible/inventory/__init__.py @@ -148,10 +148,12 @@ class Inventory(object): for g in self.groups: group = self.groups[g] group.vars = combine_vars(group.vars, self.get_group_variables(group.name)) + self.get_group_vars(group) # set host vars from host_vars/ files and vars plugins for host in self.get_hosts(): host.vars = combine_vars(host.vars, self.get_host_variables(host.name)) + self.get_host_vars(host) def _match(self, str, pattern_str): try: @@ -703,7 +705,7 @@ class Inventory(object): found_host_vars = self._find_host_vars_files(self._playbook_basedir) if found_host_vars: - self._host_vars_files = self._find_host_vars_files(self._playbook_basedir) + self._host_vars_files.union(found_host_vars) # get host vars from host_vars/ files for host in self.get_hosts(): self.get_host_vars(host) |