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

11 years ago · 4f140be711
parent 98b1cb8297 1942a69ed2
commit 4f140be711
1 changed files with 3 additions and 1 deletions
--- a/lib/ansible/runner/init.py
+++ b/lib/ansible/runner/init.py
@ -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)