From 1b650534c0046ae14edc45acef032148bdae6a83 Mon Sep 17 00:00:00 2001 From: Michał Nasiadka Date: Thu, 17 Jun 2021 08:16:11 +0200 Subject: Bump up Ansible max supported ver to 4.x This change bumps up max supported Ansible version to 4.x (ansible-core 2.11.x) and minimum to 2.10. Change-Id: I8b9212934dfab3831986e8db55671baee32f4bbd --- ansible/library/kolla_toolbox.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'ansible/library') diff --git a/ansible/library/kolla_toolbox.py b/ansible/library/kolla_toolbox.py index c860c33bc..3a613ef01 100644 --- a/ansible/library/kolla_toolbox.py +++ b/ansible/library/kolla_toolbox.py @@ -19,8 +19,11 @@ import docker import json import re +from ansible.module_utils.ansible_release import __version__ as ansible_version from ansible.module_utils.basic import AnsibleModule +from ast import literal_eval + DOCUMENTATION = ''' --- module: kolla_toolbox @@ -108,7 +111,10 @@ def gen_commandline(params): if params.get('module_name'): command.extend(['-m', params.get('module_name')]) if params.get('module_args'): - module_args = params.get('module_args') + if StrictVersion(ansible_version) < StrictVersion('2.11.0'): + module_args = params.get('module_args') + else: + module_args = literal_eval(params.get('module_args')) if isinstance(module_args, dict): module_args = ' '.join("{}='{}'".format(key, value) for key, value in module_args.items()) -- cgit v1.2.3