From 5048218ab5e3b328c085a2a3fc6c20685b9d1233 Mon Sep 17 00:00:00 2001 From: Luca Berruti Date: Wed, 14 Aug 2013 11:49:46 +0200 Subject: [PATCH 1/2] Fix: with_items and complex_args --- lib/ansible/runner/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ansible/runner/__init__.py b/lib/ansible/runner/__init__.py index 7f9e18aa1c5..66503da0fdc 100644 --- a/lib/ansible/runner/__init__.py +++ b/lib/ansible/runner/__init__.py @@ -467,8 +467,8 @@ class Runner(object): inject['item'] = x # TODO: this idiom should be replaced with an up-conversion to a Jinja2 template evaluation - if isinstance(complex_args, basestring): - complex_args = template.template(self.basedir, complex_args, inject, convert_bare=True) + if isinstance(sel.fcomplex_args, basestring): + complex_args = template.template(self.basedir, self.complex_args, inject, convert_bare=True) complex_args = utils.safe_eval(complex_args) if type(complex_args) != dict: raise errors.AnsibleError("args must be a dictionary, received %s" % complex_args) From eee278e02b9664442f6f6214ad50c74504df3853 Mon Sep 17 00:00:00 2001 From: Luca Berruti Date: Wed, 14 Aug 2013 13:26:14 +0200 Subject: [PATCH 2/2] fix --- lib/ansible/runner/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ansible/runner/__init__.py b/lib/ansible/runner/__init__.py index 66503da0fdc..0613bc73f7a 100644 --- a/lib/ansible/runner/__init__.py +++ b/lib/ansible/runner/__init__.py @@ -467,7 +467,7 @@ class Runner(object): inject['item'] = x # TODO: this idiom should be replaced with an up-conversion to a Jinja2 template evaluation - if isinstance(sel.fcomplex_args, basestring): + if isinstance(self.complex_args, basestring): complex_args = template.template(self.basedir, self.complex_args, inject, convert_bare=True) complex_args = utils.safe_eval(complex_args) if type(complex_args) != dict: