From f39015d801aa28f4b11dd38ac30d606ee9d6e3cb Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 31 Jul 2023 14:32:21 +0200 Subject: [PATCH] Use proper galera port in configuration While _galera_port is defined and used for db_setup role, it's not in fact used in a connection string for oslo.db. Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/888517 Change-Id: I6299827be3828931f9c796edb655aae8f1fcff23 --- defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 1d04b61..fabca5e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -59,7 +59,7 @@ aodh_database_user: aodh aodh_db_type: "mysql+pymysql" aodh_galera_use_ssl: "{{ galera_use_ssl | default(False) }}" aodh_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('') }}" -aodh_connection_string: "{{ aodh_db_type }}://{{ aodh_database_user }}:{{ aodh_container_db_password }}@{{ aodh_db_address }}/{{ aodh_database_name }}?charset=utf8{% if aodh_galera_use_ssl | bool %}&ssl_verify_cert=true{% if aodh_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ aodh_galera_ssl_ca_cert }}{% endif %}{% endif %}" +aodh_connection_string: "{{ aodh_db_type }}://{{ aodh_database_user }}:{{ aodh_container_db_password }}@{{ aodh_db_address }}:{{ aodh_galera_port }}/{{ aodh_database_name }}?charset=utf8{% if aodh_galera_use_ssl | bool %}&ssl_verify_cert=true{% if aodh_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ aodh_galera_ssl_ca_cert }}{% endif %}{% endif %}" aodh_galera_port: "{{ galera_port | default('3306') }}" aodh_db_max_overflow: "{{ openstack_db_max_overflow | default('50') }}" aodh_db_max_pool_size: "{{ openstack_db_max_pool_size | default('5') }}"