From 2b398f5f435cd96c6f08d01863cc3bfeb40748ec Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 31 Jul 2023 14:25:05 +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: I74735ad2f127a4c62d4e5c4d24dd1af76e5b76a3 --- templates/neutron.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2 index 1f9bb64d..0c87527c 100644 --- a/templates/neutron.conf.j2 +++ b/templates/neutron.conf.j2 @@ -210,7 +210,7 @@ memcache_use_advanced_pool = True # Database [database] -connection = mysql+pymysql://{{ neutron_galera_user }}:{{ neutron_container_mysql_password }}@{{ neutron_galera_address }}/{{ neutron_galera_database }}?charset=utf8{% if neutron_galera_use_ssl | bool %}&ssl_verify_cert=true{% if neutron_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ neutron_galera_ssl_ca_cert }}{% endif %}{% endif +%} +connection = mysql+pymysql://{{ neutron_galera_user }}:{{ neutron_container_mysql_password }}@{{ neutron_galera_address }}:{{ neutron_galera_port }}/{{ neutron_galera_database }}?charset=utf8{% if neutron_galera_use_ssl | bool %}&ssl_verify_cert=true{% if neutron_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ neutron_galera_ssl_ca_cert }}{% endif %}{% endif +%} max_overflow = {{ neutron_db_max_overflow }} max_pool_size = {{ neutron_db_max_pool_size }} pool_timeout = {{ neutron_db_pool_timeout }}