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

Redoing patch for hostvars fix, since the previous one broke other tests

Browse Source
This commit is contained in:
James Cammarata
2014-09-17 11:03:36 -05:00
parent 3180a37457
commit ed3c9c40ca
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,7 +101,7 @@ class HostVars(dict):
def __getitem__(self, host):
if host not in self.lookup:
result = self.inventory.get_variables(host, vault_password=self.vault_password).copy()
result.update(self.vars_cache)
result.update(self.vars_cache.get(host, {}))
self.lookup[host] = template.template('.', result, self.vars_cache)
return self.lookup[host]
@@ -622,6 +622,7 @@ class Runner(object):
inject['environment'] = self.environment
inject['playbook_dir'] = os.path.abspath(self.basedir)
inject['omit'] = self.omit_token
inject['combined_cache'] = combined_cache
return inject
@@ -629,7 +630,7 @@ class Runner(object):
''' executes any module one or more times '''
inject = self.get_inject_vars(host)
hostvars = HostVars(inject, self.inventory, vault_password=self.vault_pass)
hostvars = HostVars(inject['combined_cache'], self.inventory, vault_password=self.vault_pass)
inject['hostvars'] = hostvars
host_connection = inject.get('ansible_connection', self.transport)