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

Disallow args: to be specified as a string

Browse source
This commit is contained in:
James Cammarata 2014-08-12 16:55:14 -05:00
parent 600a4657b4
commit 54cbe3dcf9
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/runner/__init__.py
View file

@ -217,6 +217,10 @@ class Runner(object):
# changed later via options like accelerate # changed later via options like accelerate
self.original_transport = self.transport self.original_transport = self.transport
# enforce complex_args as a dict
if type(self.complex_args) != dict:
raise errors.AnsibleError("args must be a dictionary, received %s (%s)" % (self.complex_args, type(self.complex_args)))
# misc housekeeping # misc housekeeping
if subset and self.inventory._subset is None: if subset and self.inventory._subset is None:
# don't override subset when passed from playbook # don't override subset when passed from playbook
@ -665,11 +669,6 @@ class Runner(object):
# logic to decide how to run things depends on whether with_items is used # logic to decide how to run things depends on whether with_items is used
if items is None: if items is None:
if isinstance(complex_args, basestring):
complex_args = template.template(self.basedir, 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)
return self._executor_internal_inner(host, self.module_name, self.module_args, inject, port, complex_args=complex_args) return self._executor_internal_inner(host, self.module_name, self.module_args, inject, port, complex_args=complex_args)
elif len(items) > 0: elif len(items) > 0: