From ffe8dc3a81316b962ec8d3de21d05c8efdeabe00 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 23 Apr 2024 19:18:07 +0200 Subject: [PATCH] Implement variables to address oslo.messaging improvements During last release cycle oslo.messaging has landed [1] series of extremely useful changes that are designed to implement modern messaging techniques for rabbitmq quorum queues. Since these changes are breaking and require queues being re-created, it makes total sense to align these with migration to quorum queues by default. [1] https://review.opendev.org/q/topic:%22bug-2031497%22 Change-Id: Id66345774cc9a2e2ffbe268ea8e6c4bd8908ee72 --- defaults/main.yml | 3 +++ templates/glance-api.conf.j2 | 3 +++ 2 files changed, 6 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 4316c41d..0202c97f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -143,6 +143,9 @@ glance_oslomsg_notify_policies: [] ## RabbitMQ integration glance_oslomsg_rabbit_quorum_queues: "{{ oslomsg_rabbit_quorum_queues | default(True) }}" +glance_oslomsg_rabbit_transient_quorum_queues: "{{ oslomsg_rabbit_transient_quorum_queues | default(glance_oslomsg_rabbit_quorum_queues) }}" +glance_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(glance_oslomsg_rabbit_quorum_queues) }}" +glance_oslomsg_rabbit_stream_fanout: "{{ oslomsg_rabbit_stream_fanout | default(glance_oslomsg_rabbit_quorum_queues) }}" glance_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}" glance_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}" diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2 index e97178f4..0060748a 100644 --- a/templates/glance-api.conf.j2 +++ b/templates/glance-api.conf.j2 @@ -79,6 +79,9 @@ policy_dirs = {{ glance_policy_dirs }} {% if glance_oslomsg_rpc_transport == 'rabbit' %} [oslo_messaging_rabbit] rabbit_quorum_queue = {{ glance_oslomsg_rabbit_quorum_queues }} +transient_quorum_queue = {{ glance_oslomsg_rabbit_transient_quorum_queues }} +use_queue_manager = {{ glance_oslomsg_rabbit_queue_manager }} +rabbit_stream_fanout = {{ glance_oslomsg_rabbit_stream_fanout }} rabbit_quorum_delivery_limit = {{ glance_oslomsg_rabbit_quorum_delivery_limit }} rabbit_quorum_max_memory_bytes = {{ glance_oslomsg_rabbit_quorum_max_memory_bytes }} {% endif %}