Ensure complex_args is considered in all action_plugins

This commit is contained in:
Daniel Hokka Zakrisson 2013-02-28 14:27:42 +01:00
parent 297259725a
commit ae8d6ac303
10 changed files with 39 additions and 14 deletions

View file

@ -29,7 +29,10 @@ class ActionModule(object):
self.runner = runner
def run(self, conn, tmp, module_name, module_args, inject, complex_args=None, **kwargs):
args = utils.parse_kv(module_args)
args = {}
if complex_args:
args.update(complex_args)
args.update(utils.parse_kv(module_args))
if not 'msg' in args:
args['msg'] = 'Hello world!'