From 8d62100e61d8a8d4bbe3dcaa9fea30bc41101a15 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Fri, 3 May 2024 20:51:52 +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: I5608a853b15abad6ea538e167091af3296af38dd --- defaults/main.yml | 4 ++++ templates/zun.conf.j2 | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 6deb94f..c261df5 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -193,6 +193,10 @@ zun_oslomsg_notify_policies: [] ## RabbitMQ integration zun_oslomsg_rabbit_quorum_queues: "{{ oslomsg_rabbit_quorum_queues | default(True) }}" +zun_oslomsg_rabbit_stream_fanout: "{{ oslomsg_rabbit_stream_fanout | default(zun_oslomsg_rabbit_quorum_queues) }}" +zun_oslomsg_rabbit_transient_quorum_queues: "{{ oslomsg_rabbit_transient_quorum_queues | default(zun_oslomsg_rabbit_stream_fanout) }}" +zun_oslomsg_rabbit_qos_prefetch_count: "{{ oslomsg_rabbit_qos_prefetch_count | default(zun_oslomsg_rabbit_stream_fanout | ternary(10, 0)) }}" +zun_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(zun_oslomsg_rabbit_quorum_queues) }}" zun_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}" zun_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}" diff --git a/templates/zun.conf.j2 b/templates/zun.conf.j2 index 5acefd2..4c89e69 100644 --- a/templates/zun.conf.j2 +++ b/templates/zun.conf.j2 @@ -105,6 +105,10 @@ topics = {{ notification_topics | join(',') }} [oslo_messaging_rabbit] ssl = {{ zun_oslomsg_notify_use_ssl | bool }} rabbit_quorum_queue = {{ zun_oslomsg_rabbit_quorum_queues }} +rabbit_transient_quorum_queue = {{ zun_oslomsg_rabbit_transient_quorum_queues }} +rabbit_qos_prefetch_count = {{ zun_oslomsg_rabbit_qos_prefetch_count }} +use_queue_manager = {{ zun_oslomsg_rabbit_queue_manager }} +rabbit_stream_fanout = {{ zun_oslomsg_rabbit_stream_fanout }} rabbit_quorum_delivery_limit = {{ zun_oslomsg_rabbit_quorum_delivery_limit }} rabbit_quorum_max_memory_bytes = {{ zun_oslomsg_rabbit_quorum_max_memory_bytes }}