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

Merge branch 'devel' of https://github.com/Synforge/ansible into Synforge-devel

Browse source
This commit is contained in:
James Cammarata 2014-03-31 13:04:56 -05:00
commit 4f140be711
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -543,10 +543,12 @@ class Runner(object):
# fireball, local, etc
port = self.remote_port
module_vars = template.template(self.basedir, self.module_vars, host_variables)
inject = {}
inject = utils.combine_vars(inject, self.default_vars)
inject = utils.combine_vars(inject, host_variables)
inject = utils.combine_vars(inject, self.module_vars)
inject = utils.combine_vars(inject, module_vars)
inject = utils.combine_vars(inject, self.setup_cache[host])
inject.setdefault('ansible_ssh_user', self.remote_user)
inject['hostvars'] = HostVars(self.setup_cache, self.inventory)