openstack/openstack-ansible-os_manila
Code Issues Proposed changes

Implement variables to address oslo.messaging improvements

Browse Source 
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: Iffffbf0c567f68f6e3e26fc7fce4dd5e2317d4f3
This commit is contained in:
Dmitriy Rabotyagov 2024-05-03 20:38:27 +02:00 committed by Dmitriy Rabotyagov
parent 3a326c054a
commit d23d637fd4
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -111,6 +111,10 @@ manila_oslomsg_notify_policies: []
## RabbitMQ integration ## RabbitMQ integration
manila_oslomsg_rabbit_quorum_queues: "{{ oslomsg_rabbit_quorum_queues | default(True) }}" manila_oslomsg_rabbit_quorum_queues: "{{ oslomsg_rabbit_quorum_queues | default(True) }}"
manila_oslomsg_rabbit_stream_fanout: "{{ oslomsg_rabbit_stream_fanout | default(manila_oslomsg_rabbit_quorum_queues) }}"
manila_oslomsg_rabbit_transient_quorum_queues: "{{ oslomsg_rabbit_transient_quorum_queues | default(manila_oslomsg_rabbit_stream_fanout) }}"
manila_oslomsg_rabbit_qos_prefetch_count: "{{ oslomsg_rabbit_qos_prefetch_count | default(manila_oslomsg_rabbit_stream_fanout | ternary(10, 0)) }}"
manila_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(manila_oslomsg_rabbit_quorum_queues) }}"
manila_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}" manila_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}"
manila_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}" manila_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}"

4
templates/manila.conf.j2
View File

@ -56,6 +56,10 @@ connection_recycle_time = {{ manila_db_connection_recycle_time }}
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
ssl = {{ manila_oslomsg_rpc_use_ssl }} ssl = {{ manila_oslomsg_rpc_use_ssl }}
rabbit_quorum_queue = {{ manila_oslomsg_rabbit_quorum_queues }} rabbit_quorum_queue = {{ manila_oslomsg_rabbit_quorum_queues }}
rabbit_transient_quorum_queue = {{ manila_oslomsg_rabbit_transient_quorum_queues }}
rabbit_qos_prefetch_count = {{ manila_oslomsg_rabbit_qos_prefetch_count }}
use_queue_manager = {{ manila_oslomsg_rabbit_queue_manager }}
rabbit_stream_fanout = {{ manila_oslomsg_rabbit_stream_fanout }}
rabbit_quorum_delivery_limit = {{ manila_oslomsg_rabbit_quorum_delivery_limit }} rabbit_quorum_delivery_limit = {{ manila_oslomsg_rabbit_quorum_delivery_limit }}
rabbit_quorum_max_memory_bytes = {{ manila_oslomsg_rabbit_quorum_max_memory_bytes }} rabbit_quorum_max_memory_bytes = {{ manila_oslomsg_rabbit_quorum_max_memory_bytes }}