openstack
/
openstack-ansible-os_cloudkitty
Code Issues Proposed changes

Add qos_prefetch_count to variables 

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: I2c25783d4c65aa04ad9305adf2cbb6028e1dab57
This commit is contained in:
Dmitriy Rabotyagov 2024-05-10 18:44:14 +02:00
parent 0d69f9f02c
commit f982198725
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

@ -58,9 +58,10 @@ cloudkitty_oslomsg_rpc_ssl_version: "{{ oslomsg_rpc_ssl_version | default('TLSv1
cloudkitty_oslomsg_rpc_ssl_ca_file: "{{ oslomsg_rpc_ssl_ca_file | default('') }}"
## RabbitMQ integration
cloudkitty_oslomsg_rabbit_quorum_queues: "{{ oslomsg_rabbit_quorum_queues | default(True) }}"
cloudkitty_oslomsg_rabbit_transient_quorum_queues: "{{ oslomsg_rabbit_transient_quorum_queues | default(cloudkitty_oslomsg_rabbit_quorum_queues) }}"
cloudkitty_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(cloudkitty_oslomsg_rabbit_quorum_queues) }}"
cloudkitty_oslomsg_rabbit_stream_fanout: "{{ oslomsg_rabbit_stream_fanout | default(cloudkitty_oslomsg_rabbit_quorum_queues) }}"
cloudkitty_oslomsg_rabbit_transient_quorum_queues: "{{ oslomsg_rabbit_transient_quorum_queues | default(cloudkitty_oslomsg_rabbit_stream_fanout) }}"
cloudkitty_oslomsg_rabbit_qos_prefetch_count: "{{ oslomsg_rabbit_qos_prefetch_count | default(cloudkitty_oslomsg_rabbit_stream_fanout | ternary(10, 0)) }}"
cloudkitty_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(cloudkitty_oslomsg_rabbit_quorum_queues) }}"
cloudkitty_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}"
cloudkitty_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}"

3
templates/cloudkitty.conf.j2
View File

@ -58,7 +58,8 @@ service_type = {{ cloudkitty_service_type }}
[oslo_messaging_rabbit]
ssl = {{ cloudkitty_oslomsg_notify_use_ssl | bool }}
rabbit_quorum_queue = {{ cloudkitty_oslomsg_rabbit_quorum_queues }}
transient_quorum_queue = {{ cloudkitty_oslomsg_rabbit_transient_quorum_queues }}
rabbit_transient_quorum_queue = {{ cloudkitty_oslomsg_rabbit_transient_quorum_queues }}
rabbit_qos_prefetch_count = {{ cloudkitty_oslomsg_rabbit_qos_prefetch_count }}
use_queue_manager = {{ cloudkitty_oslomsg_rabbit_queue_manager }}
rabbit_stream_fanout = {{ cloudkitty_oslomsg_rabbit_stream_fanout }}
rabbit_quorum_delivery_limit = {{ cloudkitty_oslomsg_rabbit_quorum_delivery_limit }}