Improve variable smushing so it only has to be done in one place. This is related to shlex.split being called

on untemplated variables in some rare cases.
This commit is contained in:
Michael DeHaan 2013-04-24 21:59:47 -04:00
parent af2fb56a10
commit 6fdfbb1a34
5 changed files with 27 additions and 18 deletions

View file

@ -58,9 +58,6 @@ class Task(object):
# code to allow for saying "modulename: args" versus "action: modulename args"
if x in utils.plugins.module_finder:
if 'include' in ds and isinstance(ds, basestring):
ds['include'] = template.smush_braces(ds['include'])
if 'action' in ds:
raise errors.AnsibleError("multiple actions specified in task %s" % (ds.get('name', ds['action'])))
if isinstance(ds[x], dict):