ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-16 09:55:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #10329 from bcoca/var_merge_combined

Browse source 
changed from hash_merge to combine vars which resets default to
This commit is contained in:
Brian Coca 2015-03-12 10:58:12 -04:00
commit a675b10b3b
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/playbook/play.py
View file

@ -116,8 +116,8 @@ class Play(object):
_tasks = ds.pop('tasks', []) _tasks = ds.pop('tasks', [])
_handlers = ds.pop('handlers', []) _handlers = ds.pop('handlers', [])
temp_vars = utils.merge_hash(self.vars, self.vars_file_vars) temp_vars = utils.combine_vars(self.vars, self.vars_file_vars)
temp_vars = utils.merge_hash(temp_vars, self.playbook.extra_vars) temp_vars = utils.combine_vars(temp_vars, self.playbook.extra_vars)
ds = template(basedir, ds, temp_vars) ds = template(basedir, ds, temp_vars)
ds['tasks'] = _tasks ds['tasks'] = _tasks
@ -646,9 +646,9 @@ class Play(object):
dirname = os.path.dirname(original_file) dirname = os.path.dirname(original_file)
# temp vars are used here to avoid trampling on the existing vars structures # 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.combine_vars(self.vars, self.vars_file_vars)
temp_vars = utils.merge_hash(temp_vars, mv) temp_vars = utils.combine_vars(temp_vars, mv)
temp_vars = utils.merge_hash(temp_vars, self.playbook.extra_vars) temp_vars = utils.combine_vars(temp_vars, self.playbook.extra_vars)
include_file = template(dirname, tokens[0], temp_vars) include_file = template(dirname, tokens[0], temp_vars)
include_filename = utils.path_dwim(dirname, include_file) include_filename = utils.path_dwim(dirname, include_file)

10
lib/ansible/runner/__init__.py
View file

@ -666,11 +666,11 @@ class Runner(object):
# Then we selectively merge some variable dictionaries down to a # Then we selectively merge some variable dictionaries down to a
# single dictionary, used to template the HostVars for this host # single dictionary, used to template the HostVars for this host
temp_vars = self.inventory.get_variables(host, vault_password=self.vault_pass) 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.combine_vars(temp_vars, inject['combined_cache'] )
temp_vars = utils.merge_hash(temp_vars, self.play_vars) temp_vars = utils.combine_vars(temp_vars, {'groups': inject['groups']})
temp_vars = utils.merge_hash(temp_vars, self.play_file_vars) temp_vars = utils.combine_vars(temp_vars, self.play_vars)
temp_vars = utils.merge_hash(temp_vars, self.extra_vars) temp_vars = utils.combine_vars(temp_vars, self.play_file_vars)
temp_vars = utils.merge_hash(temp_vars, {'groups': inject['groups']}) temp_vars = utils.combine_vars(temp_vars, self.extra_vars)
hostvars = HostVars(temp_vars, self.inventory, vault_password=self.vault_pass) hostvars = HostVars(temp_vars, self.inventory, vault_password=self.vault_pass)