From 642d9d6b563837ae5187720444c76abc152fb49c Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Mon, 9 Mar 2015 12:12:37 -0400 Subject: [PATCH] readded inventory vars to runner's vars --- lib/ansible/runner/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ansible/runner/__init__.py b/lib/ansible/runner/__init__.py index 69c062e205b..c1f5b3683ce 100644 --- a/lib/ansible/runner/__init__.py +++ b/lib/ansible/runner/__init__.py @@ -608,7 +608,7 @@ class Runner(object): def get_combined_cache(self): # merge the VARS and SETUP caches for this host combined_cache = self.setup_cache.copy() - return utils.combine_vars(combined_cache, self.vars_cache) + return utils.merge_hash(combined_cache, self.vars_cache) def get_inject_vars(self, host): host_variables = self.inventory.get_variables(host, vault_password=self.vault_pass) @@ -674,6 +674,7 @@ class Runner(object): # Then we selectively merge some variable dictionaries down to a # single dictionary, used to template the HostVars for this host temp_vars = inject['combined_cache'] + temp_vars = utils.combine_vars(temp_vars, inject['combined_cache'] ) temp_vars = utils.combine_vars(temp_vars, {'groups': inject['groups']}) temp_vars = utils.combine_vars(temp_vars, self.play_vars) temp_vars = utils.combine_vars(temp_vars, self.play_file_vars)