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

Revert to using just the combined_cache for HostVars

Browse Source
This commit is contained in:
James Cammarata
2014-09-17 02:32:09 -05:00
parent 28f6a18ef6
commit e9229cfeaa
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -615,6 +615,7 @@ 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
@@ -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)