diff options
| author | Michał Nasiadka <mnasiadka@gmail.com> | 2021-06-17 08:16:11 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2021-09-23 10:45:31 +0000 |
| commit | 1b650534c0046ae14edc45acef032148bdae6a83 (patch) | |
| tree | ee388a80169ca60a07f95ab4bb197ba4804e80f6 /ansible/library | |
| parent | d8641e90c3c71cc875e90d0c39e6c3ea514a1bda (diff) | |
| download | kolla-ansible-1b650534c0046ae14edc45acef032148bdae6a83.tar.gz kolla-ansible-1b650534c0046ae14edc45acef032148bdae6a83.zip | |
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
Diffstat (limited to 'ansible/library')
| -rw-r--r-- | ansible/library/kolla_toolbox.py | 8 |
1 files changed, 7 insertions, 1 deletions
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()) |