internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 21:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

changed from hash_merge to combine vars which resets default to

Browse Source 
overwrite and not merge hashing
This commit is contained in:
Brian Coca
2015-02-24 05:05:27 -05:00
parent 65e68cdff9
commit e59b364641
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)