From 6a592e88d0a333958b68d70f3c11e783516d38b0 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Fri, 10 May 2024 17:04:26 +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. Change-Id: Ia5069c9976d07ee3949e637d8eb76a06b380cdec --- defaults/main.yml | 4 ++++ templates/nova.conf.j2 | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 4a6cda8a..6f5276c0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -175,6 +175,10 @@ nova_oslomsg_amqp1_enabled: "{{ nova_oslomsg_rpc_transport == 'amqp' }}" ### RabbitMQ info ### nova_oslomsg_rabbit_quorum_queues: "{{ oslomsg_rabbit_quorum_queues | default(True) }}" +nova_oslomsg_rabbit_stream_fanout: "{{ oslomsg_rabbit_stream_fanout | default(nova_oslomsg_rabbit_quorum_queues) }}" +nova_oslomsg_rabbit_transient_quorum_queues: "{{ oslomsg_rabbit_transient_quorum_queues | default(nova_oslomsg_rabbit_stream_fanout) }}" +nova_oslomsg_rabbit_qos_prefetch_count: "{{ oslomsg_rabbit_qos_prefetch_count | default(nova_oslomsg_rabbit_stream_fanout | ternary(10, 0)) }}" +nova_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(nova_oslomsg_rabbit_quorum_queues) }}" nova_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}" nova_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}" diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2 index cad16321..4e35f861 100644 --- a/templates/nova.conf.j2 +++ b/templates/nova.conf.j2 @@ -61,6 +61,10 @@ transport_url = {{ nova_oslomsg_notify_transport }}://{% for host in nova_osloms [oslo_messaging_rabbit] heartbeat_in_pthread = {{ nova_oslomsg_heartbeat_in_pthread }} rabbit_quorum_queue = {{ nova_oslomsg_rabbit_quorum_queues }} +rabbit_transient_quorum_queue = {{ nova_oslomsg_rabbit_transient_quorum_queues }} +rabbit_qos_prefetch_count = {{ nova_oslomsg_rabbit_qos_prefetch_count }} +use_queue_manager = {{ nova_oslomsg_rabbit_queue_manager }} +rabbit_stream_fanout = {{ nova_oslomsg_rabbit_stream_fanout }} rabbit_quorum_delivery_limit = {{ nova_oslomsg_rabbit_quorum_delivery_limit }} rabbit_quorum_max_memory_bytes = {{ nova_oslomsg_rabbit_quorum_max_memory_bytes }}