Merge pull request #1154 from dhozac/varreplace-list-join

Replace lists with a comma-separated join
pull/1155/merge
Michael DeHaan 12 years ago
commit 3582c20abb

@ -309,6 +309,8 @@ def varReplace(raw, vars, depth=0):
try: try:
replacement = _varLookup(m['path'], vars, depth) replacement = _varLookup(m['path'], vars, depth)
if isinstance(replacement, (list, tuple)):
replacement = ",".join(replacement)
if isinstance(replacement, (str, unicode)): if isinstance(replacement, (str, unicode)):
replacement = varReplace(replacement, vars, depth=depth + 1) replacement = varReplace(replacement, vars, depth=depth + 1)
except VarNotFoundException: except VarNotFoundException:

@ -225,6 +225,19 @@ class TestUtils(unittest.TestCase):
res = ansible.utils.varReplace(template, vars) res = ansible.utils.varReplace(template, vars)
assert res == 'bar' assert res == 'bar'
def test_varReplace_list_join(self):
vars = {
'list': [
'foo',
'bar',
'baz',
],
}
template = 'yum pkg=${list} state=installed'
res = ansible.utils.varReplace(template, vars)
assert res == 'yum pkg=foo,bar,baz state=installed'
def test_template_varReplace_iterated(self): def test_template_varReplace_iterated(self):
template = 'hello $who' template = 'hello $who'
vars = { vars = {

Loading…
Cancel
Save