Allow $foo and {{ bar }} to be used on the same line in playbooks.

12 years ago · 998230a84a
parent 29209c4913
commit 998230a84a
1 changed files with 1 additions and 2 deletions
--- a/lib/ansible/utils/template.py
+++ b/lib/ansible/utils/template.py
@ -234,8 +234,7 @@ def template(basedir, varname, vars, lookup_fatal=True, depth=0, expand_lists=Tr

    if isinstance(varname, basestring):
        if '{{' in varname or '{%' in varname:
-            res = template_from_string(basedir, varname, vars)
-            return res
+            varname = template_from_string(basedir, varname, vars)
        m = _varFind(basedir, varname, vars, lookup_fatal, depth, expand_lists)
        if not m:
            return varname