From 5f7cc8f0c1e7d6ca96bb1d8ae97fd60cd5dfb415 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 corrected merge vs combined in all pertinent sections fixed typoe in combined_Vars removed redundant inventory call, moved grousp to proper priority readded inventory vars to runner's vars correclty added inventory this time --- lib/ansible/playbook/play.py | 10 +++++----- lib/ansible/runner/__init__.py | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py index babc059e65f..ef097d04813 100644 --- a/lib/ansible/playbook/play.py +++ b/lib/ansible/playbook/play.py @@ -116,8 +116,8 @@ class Play(object): _tasks = ds.pop('tasks', []) _handlers = ds.pop('handlers', []) - temp_vars = utils.merge_hash(self.vars, self.vars_file_vars) - temp_vars = utils.merge_hash(temp_vars, self.playbook.extra_vars) + temp_vars = utils.combine_vars(self.vars, self.vars_file_vars) + temp_vars = utils.combine_vars(temp_vars, self.playbook.extra_vars) ds = template(basedir, ds, temp_vars) ds['tasks'] = _tasks @@ -646,9 +646,9 @@ class Play(object): dirname = os.path.dirname(original_file) # temp vars are used here to avoid trampling on the existing vars structures - temp_vars = utils.merge_hash(self.vars, self.vars_file_vars) - temp_vars = utils.merge_hash(temp_vars, mv) - temp_vars = utils.merge_hash(temp_vars, self.playbook.extra_vars) + temp_vars = utils.combine_vars(self.vars, self.vars_file_vars) + temp_vars = utils.combine_vars(temp_vars, mv) + temp_vars = utils.combine_vars(temp_vars, self.playbook.extra_vars) include_file = template(dirname, tokens[0], temp_vars) include_filename = utils.path_dwim(dirname, include_file) diff --git a/lib/ansible/runner/__init__.py b/lib/ansible/runner/__init__.py index fea76f26ada..59e4d96924f 100644 --- a/lib/ansible/runner/__init__.py +++ b/lib/ansible/runner/__init__.py @@ -666,11 +666,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, {'groups': inject['groups']}) + 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) hostvars = HostVars(temp_vars, self.inventory, vault_password=self.vault_pass)