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

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'),

ansible/roles/aodh/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating aodh database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating aodh database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/barbican/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating barbican database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating barbican database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/blazar/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating blazar database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating blazar database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"
@@ -36,6 +38,7 @@
 - name: Creating blazar host aggregate
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: os_nova_host_aggregate
     module_args:
       auth: "{{ openstack_auth }}"

ansible/roles/ceilometer/tasks/register.yml

@@ -8,6 +8,7 @@
 - name: Associate the ResellerAdmin role and ceilometer user
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: "os_user_role"
     module_args:
       project: "service"

ansible/roles/cinder/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Cinder database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating Cinder database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/cloudkitty/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Cloudkitty database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating Cloudkitty database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"
@@ -36,6 +38,7 @@
 - name: Creating Cloudkitty influxdb database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: influxdb_database
     module_args:
       hostname: "{{ influxdb_address }}"
@@ -49,6 +52,7 @@
 - name: Checking if Cloudkitty elasticsearch index exists
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: uri
     module_args:
       url: "{{ cloudkitty_elasticsearch_url }}/{{ cloudkitty_elasticsearch_index_name }}"
@@ -61,6 +65,7 @@
 - name: Creating Cloudkitty elasticsearch index
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: uri
     module_args:
       url: "{{ cloudkitty_elasticsearch_url }}/{{ cloudkitty_elasticsearch_index_name }}"

ansible/roles/cyborg/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating cyborg database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating cyborg database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/designate/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Designate databases
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -19,6 +20,7 @@
 - name: Creating Designate databases user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/elasticsearch/tasks/upgrade.yml

@@ -6,6 +6,7 @@
   vars:
     elasticsearch_shard_body: {"transient": {"cluster.routing.allocation.enable": "none"}}
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: uri
     module_args:
       url: "{{ elasticsearch_internal_endpoint }}/_cluster/settings"
@@ -20,6 +21,7 @@
 - name: Perform a synced flush
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: uri
     module_args:
       url: "{{ elasticsearch_internal_endpoint }}/_flush/synced"

ansible/roles/freezer/tasks/bootstrap.yml

@@ -1,6 +1,7 @@
 ---
 - name: Creating Freezer database
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 
 - name: Creating Freezer database user and setting permissions
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/glance/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Glance database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating Glance database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/glance/tasks/bootstrap_service.yml

@@ -2,6 +2,7 @@
 - name: Enable log_bin_trust_function_creators function
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_variables
     module_args:
       login_host: "{{ database_address }}"
@@ -38,6 +39,7 @@
 - name: Disable log_bin_trust_function_creators function
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_variables
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/glance/tasks/rolling_upgrade.yml

@@ -13,6 +13,7 @@
 - name: Enable log_bin_trust_function_creators function
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_variables
     module_args:
       login_host: "{{ database_address }}"
@@ -103,6 +104,7 @@
 - name: Disable log_bin_trust_function_creators function
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_variables
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/gnocchi/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating gnocchi database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating gnocchi database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/grafana/handlers/main.yml

@@ -23,6 +23,7 @@
     service: "{{ grafana_services[service_name] }}"
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: uri
     module_args:
       url: "http://{{ api_interface_address | put_address_in_context('url') }}:{{ grafana_server_port }}/login"

ansible/roles/grafana/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating grafana database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating grafana database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/grafana/tasks/post_config.yml

@@ -2,6 +2,7 @@
 - name: Wait for grafana application ready
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: uri
     module_args:
       url: "{{ grafana_internal_endpoint }}/login"
@@ -15,6 +16,7 @@
 - name: Enable grafana datasources
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: uri
     module_args:
       url: "{{ grafana_internal_endpoint }}/api/datasources"
@@ -36,6 +38,7 @@
 - name: Disable Getting Started panel
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: uri
     module_args:
       url: "{{ grafana_internal_endpoint }}/api/user/helpflags/1"

ansible/roles/heat/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Heat database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating Heat database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/horizon/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Horizon database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating Horizon database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/ironic/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Ironic database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -23,6 +24,7 @@
 - name: Creating Ironic database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/keystone/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating keystone database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating Keystone database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/keystone/tasks/register.yml

@@ -21,6 +21,7 @@
 - name: Creating default user role
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: "os_keystone_role"
     module_args:
       name: "{{ keystone_default_user_role }}"

ansible/roles/keystone/tasks/register_identity_providers.yml

@@ -44,6 +44,7 @@
 - name: Create unexisting domains
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: "os_keystone_domain"
     module_args:
       name: "{{ item.openstack_domain }}"

ansible/roles/keystone/tasks/upgrade.yml

@@ -6,6 +6,7 @@
 - name: Enable log_bin_trust_function_creators function
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_variables
     module_args:
       login_host: "{{ database_address }}"
@@ -35,6 +36,7 @@
 - name: Disable log_bin_trust_function_creators function
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_variables
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/magnum/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Magnum database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating Magnum database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/magnum/tasks/register.yml

@@ -9,6 +9,7 @@
 - name: Creating Magnum trustee domain
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: "os_keystone_domain"
     module_args:
       name: "{{ magnum_trustee_domain }}"
@@ -23,6 +24,7 @@
 - name: Creating Magnum trustee user
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: "os_user"
     module_args:
       name: "{{ magnum_trustee_domain_admin }}"
@@ -37,6 +39,7 @@
 - name: Creating Magnum trustee user role
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: "os_user_role"
     module_args:
       domain: "{{ trustee_domain.id }}"

ansible/roles/manila/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Manila database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating Manila database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/mariadb/tasks/loadbalancer.yml

@@ -21,6 +21,7 @@
     host: "{{ mariadb_shards_info.shards[shard_id].hosts[0] }}"
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ host }}"

ansible/roles/mariadb/tasks/register.yml

@@ -2,6 +2,7 @@
 - name: Creating shard root mysql user
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ api_interface_address }}"
@@ -18,6 +19,7 @@
 - name: Creating mysql monitor user
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ api_interface_address }}"
@@ -34,6 +36,7 @@
 - name: Creating the Mariabackup database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ api_interface_address }}"
@@ -48,6 +51,7 @@
 - name: Creating database backup user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ api_interface_address }}"
@@ -66,6 +70,7 @@
 - name: Granting permissions on Mariabackup database to backup user
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ api_interface_address }}"

ansible/roles/masakari/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Masakari database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating Masakari database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/mistral/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Mistral database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating Mistral database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/monasca/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating monasca databases
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ monasca_database_address }}"
@@ -19,6 +20,7 @@
 - name: Creating monasca database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ monasca_database_address }}"

ansible/roles/murano/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Murano database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating Murano database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/neutron/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Neutron database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating Neutron database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/nova-cell/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Nova cell database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ nova_cell_database_address }}"
@@ -16,6 +17,7 @@
 - name: Creating Nova cell database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ nova_cell_database_address }}"

ansible/roles/nova/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Nova databases
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -19,6 +20,7 @@
 - name: Creating Nova databases user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/octavia/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Octavia database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating Octavia database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/octavia/tasks/get_resources_info.yml

@@ -2,6 +2,7 @@
 - name: Get amphora flavor info
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: os_flavor_info
     module_args:
       auth: "{{ octavia_user_auth }}"
@@ -16,6 +17,7 @@
 - name: Get {{ octavia_service_auth_project }} project id
   become: True
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: os_project_info
     module_args:
       auth: "{{ octavia_user_auth }}"
@@ -32,6 +34,7 @@
 - name: Get security groups for octavia
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: os_security_group
     module_args:
       auth: "{{ octavia_user_auth }}"
@@ -50,6 +53,7 @@
 - name: Get loadbalancer management network
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: os_networks_info
     module_args:
       auth: "{{ octavia_user_auth }}"

ansible/roles/octavia/tasks/hm-interface.yml

@@ -2,6 +2,7 @@
 - name: Create ports for Octavia health-manager nodes
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: os_port
     module_args:
       auth: "{{ octavia_user_auth }}"

ansible/roles/octavia/tasks/prepare.yml

@@ -2,6 +2,7 @@
 - name: Create amphora flavor
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: os_nova_flavor
     module_args:
       auth: "{{ octavia_user_auth }}"
@@ -25,6 +26,7 @@
 - name: Create nova keypair for amphora
   become: True
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: os_keypair
     module_args:
       auth: "{{ octavia_user_auth }}"
@@ -40,6 +42,7 @@
 - name: Get {{ octavia_service_auth_project }} project id
   become: True
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: os_project_info
     module_args:
       auth: "{{ octavia_user_auth }}"
@@ -54,6 +57,7 @@
 - name: Create security groups for octavia
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: os_security_group
     module_args:
       auth: "{{ octavia_user_auth }}"
@@ -73,6 +77,7 @@
 - name: Add rules for security groups
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: os_security_group_rule
     module_args:
       auth: "{{ octavia_user_auth }}"
@@ -93,6 +98,7 @@
 - name: Create loadbalancer management network
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: os_network
     module_args:
       auth: "{{ octavia_user_auth }}"
@@ -114,6 +120,7 @@
 - name: Create loadbalancer management subnet
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: os_subnet
     module_args:
       auth: "{{ octavia_user_auth }}"

ansible/roles/octavia/tasks/register.yml

@@ -9,6 +9,7 @@
 - name: Adding octavia related roles
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: "os_keystone_role"
     module_args:
       name: "{{ item }}"

ansible/roles/openvswitch/tasks/post-config.yml

@@ -3,6 +3,7 @@
 - name: Set system-id and hw-offload
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     user: root
     module_name: openvswitch_db
     module_args:

ansible/roles/ovn/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Create br-int bridge on OpenvSwitch
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     user: root
     module_name: openvswitch_bridge
     module_args:
@@ -16,6 +17,7 @@
     ovn_cms_opts: "{{ 'enable-chassis-as-gw' if inventory_hostname in groups['ovn-controller-network'] else '' }}"
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     user: root
     module_name: openvswitch_db
     module_args:

ansible/roles/placement/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating placement databases
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating placement databases user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/prometheus/tasks/bootstrap.yml

@@ -6,6 +6,7 @@
     shard_root_user: "{% if mariadb_loadbalancer == 'haproxy' %}{{ database_user }}{% else %}{{ mariadb_shard_root_user_prefix }}{{ shard_id | string }}{% endif %}"
     shard_host: "{{ mariadb_shards_info.shards[shard_id].hosts[0] }}"
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/sahara/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating sahara database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating sahara database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/senlin/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Senlin database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating Senlin database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/service-ks-register/tasks/main.yml

@@ -2,6 +2,7 @@
 - block:
     - name: "{{ project_name }} | Creating services"
       kolla_toolbox:
+        container_engine: "{{ kolla_container_engine }}"
         module_name: "os_keystone_service"
         module_args:
           name: "{{ item.name }}"
@@ -24,6 +25,7 @@
 
     - name: "{{ project_name }} | Creating endpoints"
       kolla_toolbox:
+        container_engine: "{{ kolla_container_engine }}"
         module_name: "os_keystone_endpoint"
         module_args:
           service: "{{ item.0.name }}"
@@ -50,6 +52,7 @@
 
     - name: "{{ project_name }} | Creating projects"
       kolla_toolbox:
+        container_engine: "{{ kolla_container_engine }}"
         module_name: "os_project"
         module_args:
           name: "{{ item }}"
@@ -66,6 +69,7 @@
 
     - name: "{{ project_name }} | Creating users"
       kolla_toolbox:
+        container_engine: "{{ kolla_container_engine }}"
         module_name: "os_user"
         module_args:
           default_project: "{{ item.project }}"
@@ -88,6 +92,7 @@
 
     - name: "{{ project_name }} | Creating roles"
       kolla_toolbox:
+        container_engine: "{{ kolla_container_engine }}"
         module_name: "os_keystone_role"
         module_args:
           name: "{{ item }}"
@@ -103,6 +108,7 @@
 
     - name: "{{ project_name }} | Granting user roles"
       kolla_toolbox:
+        container_engine: "{{ kolla_container_engine }}"
         module_name: "os_user_role"
         module_args:
           user: "{{ item.user }}"

ansible/roles/service-rabbitmq/tasks/main.yml

@@ -2,6 +2,7 @@
 - block:
     - name: "{{ project_name }} | Ensure RabbitMQ vhosts exist"
       kolla_toolbox:
+        container_engine: "{{ kolla_container_engine }}"
         module_name: rabbitmq_vhost
         module_args:
           name: "{{ item }}"
@@ -14,6 +15,7 @@
 
     - name: "{{ project_name }} | Ensure RabbitMQ users exist"
       kolla_toolbox:
+        container_engine: "{{ kolla_container_engine }}"
         module_name: rabbitmq_user
         module_args:
           user: "{{ item.user }}"

ansible/roles/solum/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Solum database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating Solum database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/swift/tasks/register.yml

@@ -9,6 +9,7 @@
 - name: Creating the ResellerAdmin role
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: "os_keystone_role"
     module_args:
       name: "ResellerAdmin"

ansible/roles/tacker/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating tacker database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating tacker database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/trove/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating trove database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating trove database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/venus/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating venus database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating venus database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/vitrage/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating vitrage database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating vitrage database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/vitrage/tasks/register.yml

@@ -9,6 +9,7 @@
 - name: Adding vitrage user into admin project
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: "os_user_role"
     module_args:
       user: "{{ vitrage_keystone_user }}"

ansible/roles/watcher/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Watcher database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating Watcher database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"

ansible/roles/zun/tasks/bootstrap.yml

@@ -2,6 +2,7 @@
 - name: Creating Zun database
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_db
     module_args:
       login_host: "{{ database_address }}"
@@ -17,6 +18,7 @@
 - name: Creating Zun database user and setting permissions
   become: true
   kolla_toolbox:
+    container_engine: "{{ kolla_container_engine }}"
     module_name: mysql_user
     module_args:
       login_host: "{{ database_address }}"