openstack/openstack-ansible-os_keystone
Code Issues Proposed changes

Add qos_prefetch_count to variables

Browse Source 
When rabbit_stream_fanout is set to true, rabbit_qos_prefetch_count
should be set to a positive value.

This also fixes defenition of transient_quorum_queue as if
rabbit_stream_fanout is enabled - transient_quorum_queue should be also
enabled. [1]

[1] https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/_drivers/impl_rabbit.py#L726-L736

Change-Id: I8ea72890948ef1c4516c6272c3b19e81693e611a
This commit is contained in:
Dmitriy Rabotyagov 2024-05-10 19:07:58 +02:00
parent b14f2f1ea6
commit 98e41b6eee
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
defaults/main.yml
View File

@ -166,9 +166,10 @@ keystone_oslomsg_notify_policies: []
## RabbitMQ integration ## RabbitMQ integration
keystone_oslomsg_rabbit_quorum_queues: "{{ oslomsg_rabbit_quorum_queues | default(True) }}" 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_stream_fanout: "{{ oslomsg_rabbit_stream_fanout | default(keystone_oslomsg_rabbit_quorum_queues) }}"
keystone_oslomsg_rabbit_transient_quorum_queues: "{{ oslomsg_rabbit_transient_quorum_queues | default(keystone_oslomsg_rabbit_stream_fanout) }}"
keystone_oslomsg_rabbit_qos_prefetch_count: "{{ oslomsg_rabbit_qos_prefetch_count | default(keystone_oslomsg_rabbit_stream_fanout | ternary(10, 0)) }}"
keystone_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(keystone_oslomsg_rabbit_quorum_queues) }}"
keystone_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}" 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) }}" keystone_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}"

3
templates/keystone.conf.j2
View File

@ -29,7 +29,8 @@ transport_url = {{ keystone_oslomsg_rpc_transport }}://{% for host in keystone_o
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
rabbit_quorum_queue = {{ keystone_oslomsg_rabbit_quorum_queues }} rabbit_quorum_queue = {{ keystone_oslomsg_rabbit_quorum_queues }}
transient_quorum_queue = {{ keystone_oslomsg_rabbit_transient_quorum_queues }} rabbit_transient_quorum_queue = {{ keystone_oslomsg_rabbit_transient_quorum_queues }}
rabbit_qos_prefetch_count = {{ keystone_oslomsg_rabbit_qos_prefetch_count }}
use_queue_manager = {{ keystone_oslomsg_rabbit_queue_manager }} use_queue_manager = {{ keystone_oslomsg_rabbit_queue_manager }}
rabbit_stream_fanout = {{ keystone_oslomsg_rabbit_stream_fanout }} rabbit_stream_fanout = {{ keystone_oslomsg_rabbit_stream_fanout }}
rabbit_quorum_delivery_limit = {{ keystone_oslomsg_rabbit_quorum_delivery_limit }} rabbit_quorum_delivery_limit = {{ keystone_oslomsg_rabbit_quorum_delivery_limit }}