openstack
/
openstack-ansible-os_neutron
Code Issues Proposed changes

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: I6f1131cb9c8f15d7d9367397ff8ca1b439d66ab0
This commit is contained in:
Dmitriy Rabotyagov 2024-05-10 15:22:37 +02:00
parent 32db8f9d85
commit d0917f561c
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

@ -297,6 +297,10 @@ neutron_oslomsg_amqp1_enabled: "{{ neutron_oslomsg_rpc_transport == 'amqp' }}"
### (RabbitMQ) integration
###
neutron_oslomsg_rabbit_quorum_queues: "{{ oslomsg_rabbit_quorum_queues | default(True) }}"
neutron_oslomsg_rabbit_stream_fanout: "{{ oslomsg_rabbit_stream_fanout | default(neutron_oslomsg_rabbit_quorum_queues) }}"
neutron_oslomsg_rabbit_transient_quorum_queues: "{{ oslomsg_rabbit_transient_quorum_queues | default(neutron_oslomsg_rabbit_stream_fanout) }}"
neutron_oslomsg_rabbit_qos_prefetch_count: "{{ oslomsg_rabbit_qos_prefetch_count | default(neutron_oslomsg_rabbit_stream_fanout | ternary(10, 0)) }}"
neutron_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(neutron_oslomsg_rabbit_quorum_queues) }}"
neutron_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}"
neutron_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}"
neutron_rpc_thread_pool_size: 64

4
templates/neutron.conf.j2
View File

@ -248,6 +248,10 @@ root_helper_daemon = sudo {{ neutron_bin }}/neutron-rootwrap-daemon {{ neutron_c
rpc_conn_pool_size = {{ neutron_rpc_conn_pool_size }}
heartbeat_in_pthread = {{ neutron_oslomsg_heartbeat_in_pthread }}
rabbit_quorum_queue = {{ neutron_oslomsg_rabbit_quorum_queues }}
rabbit_transient_quorum_queue = {{ neutron_oslomsg_rabbit_transient_quorum_queues }}
rabbit_qos_prefetch_count = {{ neutron_oslomsg_rabbit_qos_prefetch_count }}
use_queue_manager = {{ neutron_oslomsg_rabbit_queue_manager }}
rabbit_stream_fanout = {{ neutron_oslomsg_rabbit_stream_fanout }}
rabbit_quorum_delivery_limit = {{ neutron_oslomsg_rabbit_quorum_delivery_limit }}
rabbit_quorum_max_memory_bytes = {{ neutron_oslomsg_rabbit_quorum_max_memory_bytes }}