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

Don't template 'vars' dictionary during templating

Browse source 
Fixes #9132
This commit is contained in:
James Cammarata 2014-09-25 14:46:16 -05:00
parent 19703617b8
commit 128c10b311
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/utils/template.py
View file

@ -166,6 +166,7 @@ class _jinja2_vars(object):
return False
def __getitem__(self, varname):
from ansible.runner import HostVars
if varname not in self.vars:
for i in self.extras:
if varname in i:
@ -175,8 +176,9 @@ class _jinja2_vars(object):
else:
raise KeyError("undefined variable: %s" % varname)
var = self.vars[varname]
# HostVars is special, return it as-is
if isinstance(var, dict) and type(var) != dict:
# HostVars is special, return it as-is, as is the special variable
# 'vars', which contains the vars structure
if isinstance(var, dict) and varname == "vars" or isinstance(var, HostVars):
return var
else:
return template(self.basedir, var, self.vars, fail_on_undefined=self.fail_on_undefined)