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

Incorporate extra vars when templating vars_files

Browse source 
Fixes #11377
This commit is contained in:
James Cammarata 2015-07-21 02:10:26 -04:00
parent b8b206005c
commit 7124504ccf
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/vars/__init__.py
View file

@ -188,7 +188,11 @@ class VariableManager:
if play: if play:
all_vars = self._combine_vars(all_vars, play.get_vars()) all_vars = self._combine_vars(all_vars, play.get_vars())
templar = Templar(loader=loader, variables=all_vars)
# create a set of temporary vars here, which incorporate any extra vars
# which may have been specified, so we can properly template vars_files
temp_vars = self._combine_vars(all_vars, self.extra_vars)
templar = Templar(loader=loader, variables=temp_vars)
for vars_file_item in play.get_vars_files(): for vars_file_item in play.get_vars_files():
try: try: