From 1ae94217ecb1f825baf6009b2cd55c017dffff95 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 31 Jul 2023 14:15:39 +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: I94cc61d88b0ec54bde01477e8fba35e341afffa2 --- templates/octavia.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/octavia.conf.j2 b/templates/octavia.conf.j2 index 9b0b79de..5ed0077e 100644 --- a/templates/octavia.conf.j2 +++ b/templates/octavia.conf.j2 @@ -29,7 +29,7 @@ driver = {{ (octavia_ceilometer_enabled | bool) | ternary('messagingv2', 'noop') transport_url = {{ octavia_oslomsg_notify_transport }}://{% for host in octavia_oslomsg_notify_servers.split(',') %}{{ octavia_oslomsg_notify_userid }}:{{ octavia_oslomsg_notify_password }}@{{ host }}:{{ octavia_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ octavia_oslomsg_notify_vhost }}{% if octavia_oslomsg_notify_use_ssl | bool %}?ssl=1&ssl_version={{ octavia_oslomsg_notify_ssl_version }}&ssl_ca_file={{ octavia_oslomsg_notify_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} [database] -connection = mysql+pymysql://{{ octavia_galera_user }}:{{ octavia_container_mysql_password }}@{{ octavia_galera_address }}/{{ octavia_galera_database }}?charset=utf8{% if octavia_galera_use_ssl | bool %}&ssl_verify_cert=true{% if octavia_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ octavia_galera_ssl_ca_cert }}{% endif %}{% endif +%} +connection = mysql+pymysql://{{ octavia_galera_user }}:{{ octavia_container_mysql_password }}@{{ octavia_galera_address }}:{{ octavia_galera_port }}/{{ octavia_galera_database }}?charset=utf8{% if octavia_galera_use_ssl | bool %}&ssl_verify_cert=true{% if octavia_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ octavia_galera_ssl_ca_cert }}{% endif %}{% endif +%} max_overflow = {{ octavia_db_max_overflow }} max_pool_size = {{ octavia_db_max_pool_size }} pool_timeout = {{ octavia_db_pool_timeout }}