Merge pull request #1611 from dhozac/no-hostvars-templating

Keep hostvars from being templated
This commit is contained in:
Michael DeHaan 2012-11-13 05:20:48 -08:00
commit 44af1408ee

View file

@ -248,7 +248,12 @@ class _jinja2_vars(object):
def __getitem__(self, varname): def __getitem__(self, varname):
if varname not in self.vars: if varname not in self.vars:
raise KeyError("undefined variable: %s" % varname) raise KeyError("undefined variable: %s" % varname)
return template_ds(self.basedir, self.vars[varname], self.vars) var = self.vars[varname]
# HostVars is special, return it as-is
if isinstance(var, dict) and type(var) != dict:
return var
else:
return template_ds(self.basedir, var, self.vars)
def template_from_file(basedir, path, vars): def template_from_file(basedir, path, vars):
''' run a file through the templating engine ''' ''' run a file through the templating engine '''