changed from hash_merge to combine vars which resets default to

overwrite and not merge hashing
pull/10329/head
Brian Coca 10 years ago
parent 65e68cdff9
commit e59b364641

@ -674,11 +674,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, self.play_vars)
temp_vars = utils.merge_hash(temp_vars, self.play_file_vars) temp_vars = utils.combine_vars(temp_vars, self.play_file_vars)
temp_vars = utils.merge_hash(temp_vars, self.extra_vars) temp_vars = utils.combine_vars(temp_vars, self.extra_vars)
temp_vars = utils.merge_hash(temp_vars, {'groups': inject['groups']}) temp_vars = utils.combine_vars(temp_vars, {'groups': inject['groups']})
hostvars = HostVars(temp_vars, self.inventory, vault_password=self.vault_pass) hostvars = HostVars(temp_vars, self.inventory, vault_password=self.vault_pass)

Loading…
Cancel
Save