summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToshio Kuratomi <a.badger@gmail.com>2016-03-07 13:44:29 -0800
committerToshio Kuratomi <a.badger@gmail.com>2016-03-07 13:44:29 -0800
commit8785f9fc3c06ff55cb569d904db539ea1f102f81 (patch)
tree6d9c7362b7a8d22fb600b0f49ce090ef909608ab
parent46ae22660760dde1117afc0e19a73f59e5b0e23c (diff)
parent0358d473ba1dc2c88d0e0b71e721b51a4eed92a5 (diff)
downloadansible-8785f9fc3c06ff55cb569d904db539ea1f102f81.tar.gz
Merge pull request #14652 from alexandrem/fix_role_vars_precedence_interpolation
Fix bug where extra vars highest precedence is violated when used ins…
-rw-r--r--lib/ansible/runner/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ansible/runner/__init__.py b/lib/ansible/runner/__init__.py
index 564f3b4657..b4a96cbc00 100644
--- a/lib/ansible/runner/__init__.py
+++ b/lib/ansible/runner/__init__.py
@@ -618,6 +618,7 @@ class Runner(object):
# 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(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)
# remove bad variables from the module vars, which may be in there due