diff options
| author | Ivan Halomi <i.halomi@partner.samsung.com> | 2022-10-26 21:20:11 +0200 |
|---|---|---|
| committer | Ivan Halomi <i.halomi@partner.samsung.com> | 2022-11-04 15:32:30 +0100 |
| commit | 4ca2d41762dcdeab71d576ebcc91f4def95c2e3a (patch) | |
| tree | 1eb887f457974c745a7735dd0c0a9ba5df6c8cbe /ansible/library | |
| parent | 0761285f90cfdb3aa241b6a0ea644be8ad4b3e00 (diff) | |
| download | kolla-ansible-4ca2d41762dcdeab71d576ebcc91f4def95c2e3a.tar.gz kolla-ansible-4ca2d41762dcdeab71d576ebcc91f4def95c2e3a.zip | |
Adding container_engine to kolla_toolbox module
Second part of patchset:
https://review.opendev.org/c/openstack/kolla-ansible/+/799229/
in which was suggested to split patch into smaller ones.
THis change adds container_engine to module parameters
so when we introduce podman, kolla_toolbox can be used
for both engines.
Signed-off-by: Ivan Halomi <i.halomi@partner.samsung.com>
Co-authored-by: Martin Hiner <m.hiner@partner.samsung.com>
Change-Id: Ic2093aa9341a0cb36df8f340cf290d62437504ad
Diffstat (limited to 'ansible/library')
| -rw-r--r-- | ansible/library/kolla_toolbox.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ansible/library/kolla_toolbox.py b/ansible/library/kolla_toolbox.py index 7ad3aa99f..433f3ce7c 100644 --- a/ansible/library/kolla_toolbox.py +++ b/ansible/library/kolla_toolbox.py @@ -33,6 +33,11 @@ description: - A module targerting at invoking ansible module in kolla_toolbox container as used by Kolla project. options: + container_engine: + description: + - Name of container engine to use + required: True + type: str module_name: description: - The module name to invoke @@ -73,10 +78,12 @@ EXAMPLES = ''' tasks: - name: Ensure the direct absent kolla_toolbox: + container_engine: docker module_name: file module_args: path=/tmp/a state=absent - name: Create mysql database kolla_toolbox: + container_engine: docker module_name: mysql_db module_args: login_host: 192.168.1.10 @@ -85,6 +92,7 @@ EXAMPLES = ''' name: testdb - name: Creating default user role kolla_toolbox: + container_engine: docker module_name: os_keystone_role module_args: name: _member_ @@ -138,6 +146,7 @@ def docker_supports_environment_in_exec(client): def main(): specs = dict( + container_engine=dict(required=True, type='str'), module_name=dict(required=True, type='str'), module_args=dict(type='str'), module_extra_vars=dict(type='json'), |