diff --git a/ansible/library/kolla_toolbox.py b/ansible/library/kolla_toolbox.py index 7ad3aa99f1..433f3ce7c1 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'), diff --git a/ansible/roles/aodh/tasks/bootstrap.yml b/ansible/roles/aodh/tasks/bootstrap.yml index a78c1c2afb..6ac0f93438 100644 --- a/ansible/roles/aodh/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/barbican/tasks/bootstrap.yml b/ansible/roles/barbican/tasks/bootstrap.yml index 7f80093f20..4ace947a6c 100644 --- a/ansible/roles/barbican/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/blazar/tasks/bootstrap.yml b/ansible/roles/blazar/tasks/bootstrap.yml index c46a8ee993..46e51a2304 100644 --- a/ansible/roles/blazar/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/ceilometer/tasks/register.yml b/ansible/roles/ceilometer/tasks/register.yml index de5a675022..f44a6c6fd4 100644 --- a/ansible/roles/ceilometer/tasks/register.yml +++ b/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" diff --git a/ansible/roles/cinder/tasks/bootstrap.yml b/ansible/roles/cinder/tasks/bootstrap.yml index 25f2e37338..36b8bfe27e 100644 --- a/ansible/roles/cinder/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/cloudkitty/tasks/bootstrap.yml b/ansible/roles/cloudkitty/tasks/bootstrap.yml index 41348dc49a..679c33ae95 100644 --- a/ansible/roles/cloudkitty/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/cyborg/tasks/bootstrap.yml b/ansible/roles/cyborg/tasks/bootstrap.yml index 9739bed680..c31cf6c276 100644 --- a/ansible/roles/cyborg/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/designate/tasks/bootstrap.yml b/ansible/roles/designate/tasks/bootstrap.yml index 8173bb120e..7180dae368 100644 --- a/ansible/roles/designate/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/elasticsearch/tasks/upgrade.yml b/ansible/roles/elasticsearch/tasks/upgrade.yml index 518f4bb2fd..da08a40dd3 100644 --- a/ansible/roles/elasticsearch/tasks/upgrade.yml +++ b/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" diff --git a/ansible/roles/freezer/tasks/bootstrap.yml b/ansible/roles/freezer/tasks/bootstrap.yml index 952e85d1c2..039e681f04 100644 --- a/ansible/roles/freezer/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/glance/tasks/bootstrap.yml b/ansible/roles/glance/tasks/bootstrap.yml index 8bcf5a6f40..9ba1afb862 100644 --- a/ansible/roles/glance/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/glance/tasks/bootstrap_service.yml b/ansible/roles/glance/tasks/bootstrap_service.yml index 756d8cbf73..a92555fb5b 100644 --- a/ansible/roles/glance/tasks/bootstrap_service.yml +++ b/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 }}" diff --git a/ansible/roles/glance/tasks/rolling_upgrade.yml b/ansible/roles/glance/tasks/rolling_upgrade.yml index 2215616761..6e3fe4840f 100644 --- a/ansible/roles/glance/tasks/rolling_upgrade.yml +++ b/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 }}" diff --git a/ansible/roles/gnocchi/tasks/bootstrap.yml b/ansible/roles/gnocchi/tasks/bootstrap.yml index e2cb62e373..2157d78826 100644 --- a/ansible/roles/gnocchi/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/grafana/handlers/main.yml b/ansible/roles/grafana/handlers/main.yml index 0f13e4a187..e3e1d4e306 100644 --- a/ansible/roles/grafana/handlers/main.yml +++ b/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" diff --git a/ansible/roles/grafana/tasks/bootstrap.yml b/ansible/roles/grafana/tasks/bootstrap.yml index 5c4e56c400..8c8df3d4a7 100644 --- a/ansible/roles/grafana/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/grafana/tasks/post_config.yml b/ansible/roles/grafana/tasks/post_config.yml index 9a085b10ea..a59a689ceb 100644 --- a/ansible/roles/grafana/tasks/post_config.yml +++ b/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" diff --git a/ansible/roles/heat/tasks/bootstrap.yml b/ansible/roles/heat/tasks/bootstrap.yml index 50d8b27138..8f893ce69d 100644 --- a/ansible/roles/heat/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/horizon/tasks/bootstrap.yml b/ansible/roles/horizon/tasks/bootstrap.yml index ecac253e2c..2ec7e6a780 100644 --- a/ansible/roles/horizon/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/ironic/tasks/bootstrap.yml b/ansible/roles/ironic/tasks/bootstrap.yml index e1b9c164ae..1de6550ea1 100644 --- a/ansible/roles/ironic/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/keystone/tasks/bootstrap.yml b/ansible/roles/keystone/tasks/bootstrap.yml index 15f19d2b5b..e31041394f 100644 --- a/ansible/roles/keystone/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/keystone/tasks/register.yml b/ansible/roles/keystone/tasks/register.yml index 5666b87395..9640088948 100644 --- a/ansible/roles/keystone/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/keystone/tasks/register_identity_providers.yml b/ansible/roles/keystone/tasks/register_identity_providers.yml index 45d8540585..4695ab2576 100644 --- a/ansible/roles/keystone/tasks/register_identity_providers.yml +++ b/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 }}" diff --git a/ansible/roles/keystone/tasks/upgrade.yml b/ansible/roles/keystone/tasks/upgrade.yml index cd387b787a..fab3e736c4 100644 --- a/ansible/roles/keystone/tasks/upgrade.yml +++ b/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 }}" diff --git a/ansible/roles/magnum/tasks/bootstrap.yml b/ansible/roles/magnum/tasks/bootstrap.yml index bf0afa219a..54b4afef83 100644 --- a/ansible/roles/magnum/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/magnum/tasks/register.yml b/ansible/roles/magnum/tasks/register.yml index a258d3a1d9..6933ea1625 100644 --- a/ansible/roles/magnum/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/manila/tasks/bootstrap.yml b/ansible/roles/manila/tasks/bootstrap.yml index 061c27dedd..5c399321b7 100644 --- a/ansible/roles/manila/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/mariadb/tasks/loadbalancer.yml b/ansible/roles/mariadb/tasks/loadbalancer.yml index 8ea7c2d7d0..a6bb385ae0 100644 --- a/ansible/roles/mariadb/tasks/loadbalancer.yml +++ b/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 }}" diff --git a/ansible/roles/mariadb/tasks/register.yml b/ansible/roles/mariadb/tasks/register.yml index 504061f3db..a4a1eb6b1c 100644 --- a/ansible/roles/mariadb/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/masakari/tasks/bootstrap.yml b/ansible/roles/masakari/tasks/bootstrap.yml index 518b4bf3cc..9e74a4e99f 100644 --- a/ansible/roles/masakari/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/mistral/tasks/bootstrap.yml b/ansible/roles/mistral/tasks/bootstrap.yml index d553572ff5..da3d5bc736 100644 --- a/ansible/roles/mistral/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/monasca/tasks/bootstrap.yml b/ansible/roles/monasca/tasks/bootstrap.yml index 402c5b0201..56de78aa6d 100644 --- a/ansible/roles/monasca/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/murano/tasks/bootstrap.yml b/ansible/roles/murano/tasks/bootstrap.yml index 00ce24f37e..fd29f18597 100644 --- a/ansible/roles/murano/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/neutron/tasks/bootstrap.yml b/ansible/roles/neutron/tasks/bootstrap.yml index 7dc876bcb1..75c150817a 100644 --- a/ansible/roles/neutron/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/nova-cell/tasks/bootstrap.yml b/ansible/roles/nova-cell/tasks/bootstrap.yml index 06855f6e17..f7fb139109 100644 --- a/ansible/roles/nova-cell/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/nova/tasks/bootstrap.yml b/ansible/roles/nova/tasks/bootstrap.yml index a1375720bb..57295ef7ec 100644 --- a/ansible/roles/nova/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/octavia/tasks/bootstrap.yml b/ansible/roles/octavia/tasks/bootstrap.yml index 9fb146b02e..01352ecd99 100644 --- a/ansible/roles/octavia/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/octavia/tasks/get_resources_info.yml b/ansible/roles/octavia/tasks/get_resources_info.yml index d5e13f01e3..83d0911b85 100644 --- a/ansible/roles/octavia/tasks/get_resources_info.yml +++ b/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 }}" diff --git a/ansible/roles/octavia/tasks/hm-interface.yml b/ansible/roles/octavia/tasks/hm-interface.yml index 4ebf07aaf3..f7dcab702c 100644 --- a/ansible/roles/octavia/tasks/hm-interface.yml +++ b/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 }}" diff --git a/ansible/roles/octavia/tasks/prepare.yml b/ansible/roles/octavia/tasks/prepare.yml index b3815f0867..cabdf91990 100644 --- a/ansible/roles/octavia/tasks/prepare.yml +++ b/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 }}" diff --git a/ansible/roles/octavia/tasks/register.yml b/ansible/roles/octavia/tasks/register.yml index 079a59a022..454abcc037 100644 --- a/ansible/roles/octavia/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/openvswitch/tasks/post-config.yml b/ansible/roles/openvswitch/tasks/post-config.yml index 7d71387e3b..5b6146f4df 100644 --- a/ansible/roles/openvswitch/tasks/post-config.yml +++ b/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: diff --git a/ansible/roles/ovn/tasks/bootstrap.yml b/ansible/roles/ovn/tasks/bootstrap.yml index 6da56297b5..7c2fb0f14a 100644 --- a/ansible/roles/ovn/tasks/bootstrap.yml +++ b/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: diff --git a/ansible/roles/placement/tasks/bootstrap.yml b/ansible/roles/placement/tasks/bootstrap.yml index 62b4317a92..43a7872725 100644 --- a/ansible/roles/placement/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/prometheus/tasks/bootstrap.yml b/ansible/roles/prometheus/tasks/bootstrap.yml index 8086169337..3a488437bb 100644 --- a/ansible/roles/prometheus/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/sahara/tasks/bootstrap.yml b/ansible/roles/sahara/tasks/bootstrap.yml index 0ab7ce99e4..4df9410f81 100644 --- a/ansible/roles/sahara/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/senlin/tasks/bootstrap.yml b/ansible/roles/senlin/tasks/bootstrap.yml index 8ff87b92a4..f8f0a6212b 100644 --- a/ansible/roles/senlin/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/service-ks-register/tasks/main.yml b/ansible/roles/service-ks-register/tasks/main.yml index e96bf2b5ca..069a255f68 100644 --- a/ansible/roles/service-ks-register/tasks/main.yml +++ b/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 }}" diff --git a/ansible/roles/service-rabbitmq/tasks/main.yml b/ansible/roles/service-rabbitmq/tasks/main.yml index 6475d89fcc..4bc22e3bd6 100644 --- a/ansible/roles/service-rabbitmq/tasks/main.yml +++ b/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 }}" diff --git a/ansible/roles/solum/tasks/bootstrap.yml b/ansible/roles/solum/tasks/bootstrap.yml index cf38cbb42f..7d58b4d204 100644 --- a/ansible/roles/solum/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/swift/tasks/register.yml b/ansible/roles/swift/tasks/register.yml index d35b0b9b5c..c6dcb02040 100644 --- a/ansible/roles/swift/tasks/register.yml +++ b/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" diff --git a/ansible/roles/tacker/tasks/bootstrap.yml b/ansible/roles/tacker/tasks/bootstrap.yml index 623ca52130..4b2c6dcbdc 100644 --- a/ansible/roles/tacker/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/trove/tasks/bootstrap.yml b/ansible/roles/trove/tasks/bootstrap.yml index c3d5ba5787..4848b06b57 100644 --- a/ansible/roles/trove/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/venus/tasks/bootstrap.yml b/ansible/roles/venus/tasks/bootstrap.yml index 0edce5d50b..26f42f3458 100644 --- a/ansible/roles/venus/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/vitrage/tasks/bootstrap.yml b/ansible/roles/vitrage/tasks/bootstrap.yml index 2670fbf7a7..69be94dc64 100644 --- a/ansible/roles/vitrage/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/vitrage/tasks/register.yml b/ansible/roles/vitrage/tasks/register.yml index 6bbd0561d3..3c88a21bf5 100644 --- a/ansible/roles/vitrage/tasks/register.yml +++ b/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 }}" diff --git a/ansible/roles/watcher/tasks/bootstrap.yml b/ansible/roles/watcher/tasks/bootstrap.yml index d1622da412..294c76351e 100644 --- a/ansible/roles/watcher/tasks/bootstrap.yml +++ b/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 }}" diff --git a/ansible/roles/zun/tasks/bootstrap.yml b/ansible/roles/zun/tasks/bootstrap.yml index 6b45af6eaf..fd8a9f9a34 100644 --- a/ansible/roles/zun/tasks/bootstrap.yml +++ b/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 }}"