From c977bb1d11390b880cd296a24caa4c5d02e6a3ad Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 24 Apr 2024 11:51:55 +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: Ia7fc7b8d33c3c08e89310e30d90109d6b56f2672 --- defaults/main.yml | 3 +++ templates/keystone.conf.j2 | 3 +++ 2 files changed, 6 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 9b01011f..ea1795c1 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -166,6 +166,9 @@ keystone_oslomsg_notify_policies: [] ## RabbitMQ integration keystone_oslomsg_rabbit_quorum_queues: "{{ oslomsg_rabbit_quorum_queues | default(True) }}" +keystone_oslomsg_rabbit_transient_quorum_queues: "{{ oslomsg_rabbit_transient_quorum_queues | default(keystone_oslomsg_rabbit_quorum_queues) }}" +keystone_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(keystone_oslomsg_rabbit_quorum_queues) }}" +keystone_oslomsg_rabbit_stream_fanout: "{{ oslomsg_rabbit_stream_fanout | default(keystone_oslomsg_rabbit_quorum_queues) }}" keystone_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}" keystone_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}" diff --git a/templates/keystone.conf.j2 b/templates/keystone.conf.j2 index b9184933..be519493 100644 --- a/templates/keystone.conf.j2 +++ b/templates/keystone.conf.j2 @@ -29,6 +29,9 @@ transport_url = {{ keystone_oslomsg_rpc_transport }}://{% for host in keystone_o [oslo_messaging_rabbit] rabbit_quorum_queue = {{ keystone_oslomsg_rabbit_quorum_queues }} +transient_quorum_queue = {{ keystone_oslomsg_rabbit_transient_quorum_queues }} +use_queue_manager = {{ keystone_oslomsg_rabbit_queue_manager }} +rabbit_stream_fanout = {{ keystone_oslomsg_rabbit_stream_fanout }} rabbit_quorum_delivery_limit = {{ keystone_oslomsg_rabbit_quorum_delivery_limit }} rabbit_quorum_max_memory_bytes = {{ keystone_oslomsg_rabbit_quorum_max_memory_bytes }} {% endif %}