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

Merge pull request #14652 from alexandrem/fix_role_vars_precedence_interpolation

Browse source 
Fix bug where extra vars highest precedence is violated when used ins…
This commit is contained in:
Toshio Kuratomi 2016-03-07 13:44:29 -08:00
commit 8785f9fc3c
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -618,6 +618,7 @@ class Runner(object):
# since some of the variables we'll be replacing may be contained there too # since some of the variables we'll be replacing may be contained there too
module_vars_inject = utils.combine_vars(host_variables, combined_cache.get(host, {})) module_vars_inject = utils.combine_vars(host_variables, combined_cache.get(host, {}))
module_vars_inject = utils.combine_vars(self.module_vars, module_vars_inject) module_vars_inject = utils.combine_vars(self.module_vars, module_vars_inject)
module_vars_inject = utils.combine_vars(module_vars_inject, self.extra_vars)
module_vars = template.template(self.basedir, self.module_vars, module_vars_inject) module_vars = template.template(self.basedir, self.module_vars, module_vars_inject)
# remove bad variables from the module vars, which may be in there due # remove bad variables from the module vars, which may be in there due