Commit 3180a374 by James Cammarata

Revert "Revert to using just the combined_cache for HostVars"

This reverts commit e9229cfe.
parent e294e31f
......@@ -615,7 +615,6 @@ class Runner(object):
inject = utils.combine_vars(inject, self.extra_vars)
# and then special vars
inject.setdefault('ansible_ssh_user', self.remote_user)
inject['combined_cache'] = combined_cache
inject['group_names'] = host_variables.get('group_names', [])
inject['groups'] = self.inventory.groups_list()
inject['vars'] = self.module_vars
......@@ -630,7 +629,7 @@ class Runner(object):
''' executes any module one or more times '''
inject = self.get_inject_vars(host)
hostvars = HostVars(inject['combined_cache'], self.inventory, vault_password=self.vault_pass)
hostvars = HostVars(inject, self.inventory, vault_password=self.vault_pass)
inject['hostvars'] = hostvars
host_connection = inject.get('ansible_connection', self.transport)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment