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

Don't let with_items erase 'hostvars'

Browse source
This commit is contained in:
Michael DeHaan 2012-07-20 10:02:35 -04:00
parent b574c70006
commit dcca08b27b
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

@ -528,10 +528,9 @@ class Runner(object):
host_variables = self.inventory.get_variables(host) host_variables = self.inventory.get_variables(host)
port = host_variables.get('ansible_ssh_port', self.remote_port) port = host_variables.get('ansible_ssh_port', self.remote_port)
inject = self.setup_cache[host].copy() inject = self.setup_cache[host].copy()
inject['hostvars'] = self.setup_cache
inject.update(host_variables) inject.update(host_variables)
inject.update(self.module_vars) inject.update(self.module_vars)
inject['hostvars'] = self.setup_cache
items = self.module_vars.get('items', []) items = self.module_vars.get('items', [])
if isinstance(items, basestring) and items.startswith("$"): if isinstance(items, basestring) and items.startswith("$"):