From e59b3646416942504c4392a3eaf4f8859d1187e8 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Tue, 24 Feb 2015 05:05:27 -0500 Subject: [PATCH] changed from hash_merge to combine vars which resets default to overwrite and not merge hashing --- lib/ansible/runner/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/ansible/runner/__init__.py b/lib/ansible/runner/__init__.py index 79a167c5a00..7a693cc8d01 100644 --- a/lib/ansible/runner/__init__.py +++ b/lib/ansible/runner/__init__.py @@ -674,11 +674,11 @@ 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 = self.inventory.get_variables(host, vault_password=self.vault_pass) - temp_vars = utils.merge_hash(temp_vars, inject['combined_cache']) - temp_vars = utils.merge_hash(temp_vars, self.play_vars) - temp_vars = utils.merge_hash(temp_vars, self.play_file_vars) - temp_vars = utils.merge_hash(temp_vars, self.extra_vars) - temp_vars = utils.merge_hash(temp_vars, {'groups': inject['groups']}) + temp_vars = utils.combine_vars(temp_vars, inject['combined_cache']) + temp_vars = utils.combine_vars(temp_vars, self.play_vars) + temp_vars = utils.combine_vars(temp_vars, self.play_file_vars) + temp_vars = utils.combine_vars(temp_vars, self.extra_vars) + temp_vars = utils.combine_vars(temp_vars, {'groups': inject['groups']}) hostvars = HostVars(temp_vars, self.inventory, vault_password=self.vault_pass)