From 60d9d8b306bc2778033e2803b25885818323c105 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 31 Jul 2023 15:45:51 +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. Change-Id: I65cbe26804fab48aed3c88ed75bfc7f28d3b5f9e --- templates/zun.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/zun.conf.j2 b/templates/zun.conf.j2 index 6e2a5a9..f2bdcb5 100644 --- a/templates/zun.conf.j2 +++ b/templates/zun.conf.j2 @@ -23,7 +23,7 @@ endpoint_type = {{ zun_service_endpoint_type }} {% if group_names | intersect(zun_services.keys() | difference('zun-compute') | map('extract', zun_services, 'group') | list) | count > 0 %} [database] -connection = mysql+pymysql://{{ zun_galera_user }}:{{ zun_galera_password }}@{{ zun_galera_address }}/{{ zun_galera_database }}?charset=utf8{% if zun_galera_use_ssl | bool %}&ssl_verify_cert=true{% if zun_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ zun_galera_ssl_ca_cert }}{% endif %}{% endif +%} +connection = mysql+pymysql://{{ zun_galera_user }}:{{ zun_galera_password }}@{{ zun_galera_address }}:{{ zun_galera_port }}/{{ zun_galera_database }}?charset=utf8{% if zun_galera_use_ssl | bool %}&ssl_verify_cert=true{% if zun_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ zun_galera_ssl_ca_cert }}{% endif %}{% endif +%} max_overflow = {{ zun_db_max_overflow }} max_pool_size = {{ zun_db_max_pool_size }} pool_timeout = {{ zun_db_pool_timeout }}