cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

readded inventory vars to runner's vars

Browse source
This commit is contained in:
Brian Coca 2015-03-09 12:12:37 -04:00
parent 5453e2cbb8
commit 642d9d6b56
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -608,7 +608,7 @@ class Runner(object):
def get_combined_cache(self):
# merge the VARS and SETUP caches for this host
combined_cache = self.setup_cache.copy()
return utils.combine_vars(combined_cache, self.vars_cache)
return utils.merge_hash(combined_cache, self.vars_cache)
def get_inject_vars(self, host):
host_variables = self.inventory.get_variables(host, vault_password=self.vault_pass)
@ -674,6 +674,7 @@ 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 = inject['combined_cache']
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)