Allow variables in variables in templates

lib/ansible/utils.py

@@ -279,13 +279,13 @@ def template_from_file(basedir, path, vars, setup_cache):
     ''' run a file through the templating engine '''
     environment = jinja2.Environment(loader=jinja2.FileSystemLoader(basedir), trim_blocks=False)
     data = codecs.open(path_dwim(basedir, path), encoding="utf8").read()
-    template = environment.from_string(data)
+    t = environment.from_string(data)
     vars = vars.copy()
     vars['hostvars'] = setup_cache
-    res = template.render(vars)
+    res = t.render(vars)
     if data.endswith('\n') and not res.endswith('\n'):
         res = res + '\n'
-    return res
+    return template(res, vars, setup_cache)
 
 def parse_yaml(data):
     return yaml.load(data)