From 8f2bd1661ecd80dbba4bef40b6fe76f1a3d63a7a Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
Date: Wed, 25 Sep 2024 15:40:00 +0200
Subject: [PATCH] Move rpc_conn_pool_size to oslo_messaging_rabbit

Defining option in DEFAULT section is deprecated, which triggers
a deprecation warning in logs.

Change-Id: I50cc79528c57a92ca4a62e8952258d57a3954d81
---
 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 622fc225..ba39194a 100644
--- a/templates/octavia.conf.j2
+++ b/templates/octavia.conf.j2
@@ -2,7 +2,6 @@
 debug = {{ debug }}
 use_journal = True
 executor_thread_pool_size = {{ octavia_rpc_thread_pool_size }}
-rpc_conn_pool_size = {{ octavia_rpc_conn_pool_size }}
 transport_url = {{ octavia_oslomsg_rpc_transport }}://{% for host in octavia_oslomsg_rpc_servers.split(',') %}{{ octavia_oslomsg_rpc_userid }}:{{ octavia_oslomsg_rpc_password }}@{{ host }}:{{ octavia_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ _octavia_oslomsg_rpc_vhost_conf }}{% if octavia_oslomsg_rpc_use_ssl | bool %}?ssl=1&ssl_version={{ octavia_oslomsg_rpc_ssl_version }}&ssl_ca_file={{ octavia_oslomsg_rpc_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
 
 [api_settings]
@@ -23,6 +22,7 @@ topic = octavia_prov
 
 [oslo_messaging_rabbit]
 ssl = {{ octavia_oslomsg_rpc_use_ssl }}
+rpc_conn_pool_size = {{ octavia_rpc_conn_pool_size }}
 rabbit_quorum_queue = {{ octavia_oslomsg_rabbit_quorum_queues }}
 rabbit_transient_quorum_queue = {{ octavia_oslomsg_rabbit_transient_quorum_queues }}
 rabbit_qos_prefetch_count = {{ octavia_oslomsg_rabbit_qos_prefetch_count }}