From a311872c5b1631ad7c2fcc874696008a4a70c0b7 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Thu, 14 Jan 2016 18:06:54 -0500 Subject: [PATCH] overwrite/merge not remove prev inventory data --- lib/ansible/inventory/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ansible/inventory/__init__.py b/lib/ansible/inventory/__init__.py index 885005960f..5885d28014 100644 --- a/lib/ansible/inventory/__init__.py +++ b/lib/ansible/inventory/__init__.py @@ -736,11 +736,11 @@ class Inventory(object): if group and host is None: # load vars in dir/group_vars/name_of_group base_path = os.path.realpath(os.path.join(basedir, "group_vars/%s" % group.name)) - results = self._variable_manager.add_group_vars_file(base_path, self._loader) + results = combine_vars(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.realpath(os.path.join(basedir, "host_vars/%s" % host.name)) - results = self._variable_manager.add_host_vars_file(base_path, self._loader) + results = combine_vars(results, self._variable_manager.add_host_vars_file(base_path, self._loader)) # all done, results is a dictionary of variables for this particular host. return results