ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Revert "Revert to using just the combined_cache for HostVars"

Browse source 
This reverts commit e9229cfeaa.
This commit is contained in:
James Cammarata 2014-09-17 10:22:38 -05:00
parent e294e31fd3
commit 3180a37457
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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)