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

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

Browse source 
Return original string for non-matched vars
This commit is contained in:
Michael DeHaan 2012-11-01 16:32:48 -07:00
parent 4399d9c3cb 56314f7225
commit 4cc1ff4b21
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/template.py
View file

@ -187,7 +187,10 @@ def varReplaceWithItems(basedir, varname, vars):
if not m:
return varname
if m['start'] == 0 and m['end'] == len(varname):
return varReplaceWithItems(basedir, m['replacement'], vars)
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)):

4
test/TestUtils.py
View file

@ -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