Merge pull request #1508 from dhozac/host_vars-in-include

Return original string for non-matched vars

lib/ansible/template.py

@@ -187,8 +187,11 @@ def varReplaceWithItems(basedir, varname, vars):
         if not m:
             return varname
         if m['start'] == 0 and m['end'] == len(varname):
+            if m['replacement'] is not None:
                 return varReplaceWithItems(basedir, m['replacement'], vars)
             else:
+                return varname
+        else:
             return template(basedir, varname, vars)
     elif isinstance(varname, (list, tuple)):
         return [varReplaceWithItems(basedir, v, vars) for v in varname]

test/TestUtils.py

@@ -324,6 +324,10 @@ class TestUtils(unittest.TestCase):
         res = ansible.utils.varReplaceWithItems(None, template, vars)
         assert sorted(res) == sorted(vars['alphas'])
 
+        template = '${data.nonexisting}'
+        res = ansible.utils.varReplaceWithItems(None, template, vars)
+        assert res == template
+
     #####################################
     ### Template function tests