Commit 8262f7bf by James Cammarata

Merge branch 'with_items_and_complex_args' of…

Merge branch 'with_items_and_complex_args' of https://github.com/lberruti/ansible into lberruti-with_items_and_complex_args
parents c4a7b1d2 eee278e0
...@@ -477,8 +477,8 @@ class Runner(object): ...@@ -477,8 +477,8 @@ class Runner(object):
inject['item'] = x inject['item'] = x
# TODO: this idiom should be replaced with an up-conversion to a Jinja2 template evaluation # TODO: this idiom should be replaced with an up-conversion to a Jinja2 template evaluation
if isinstance(complex_args, basestring): if isinstance(self.complex_args, basestring):
complex_args = template.template(self.basedir, complex_args, inject, convert_bare=True) complex_args = template.template(self.basedir, self.complex_args, inject, convert_bare=True)
complex_args = utils.safe_eval(complex_args) complex_args = utils.safe_eval(complex_args)
if type(complex_args) != dict: if type(complex_args) != dict:
raise errors.AnsibleError("args must be a dictionary, received %s" % complex_args) raise errors.AnsibleError("args must be a dictionary, received %s" % complex_args)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment