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: Ia10d3945717f07051680e72552e38f2e2d4ddf12
This commit is contained in:
parent
64a3d069bc
commit
dde7fe5e4e
@ -143,9 +143,10 @@ glance_oslomsg_notify_policies: []
|
|||||||
|
|
||||||
## RabbitMQ integration
|
## RabbitMQ integration
|
||||||
glance_oslomsg_rabbit_quorum_queues: "{{ oslomsg_rabbit_quorum_queues | default(True) }}"
|
glance_oslomsg_rabbit_quorum_queues: "{{ oslomsg_rabbit_quorum_queues | default(True) }}"
|
||||||
glance_oslomsg_rabbit_transient_quorum_queues: "{{ oslomsg_rabbit_transient_quorum_queues | default(glance_oslomsg_rabbit_quorum_queues) }}"
|
|
||||||
glance_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(glance_oslomsg_rabbit_quorum_queues) }}"
|
|
||||||
glance_oslomsg_rabbit_stream_fanout: "{{ oslomsg_rabbit_stream_fanout | default(glance_oslomsg_rabbit_quorum_queues) }}"
|
glance_oslomsg_rabbit_stream_fanout: "{{ oslomsg_rabbit_stream_fanout | default(glance_oslomsg_rabbit_quorum_queues) }}"
|
||||||
|
glance_oslomsg_rabbit_transient_quorum_queues: "{{ oslomsg_rabbit_transient_quorum_queues | default(glance_oslomsg_rabbit_stream_fanout) }}"
|
||||||
|
glance_oslomsg_rabbit_qos_prefetch_count: "{{ oslomsg_rabbit_qos_prefetch_count | default(glance_oslomsg_rabbit_stream_fanout | ternary(10, 0)) }}"
|
||||||
|
glance_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(glance_oslomsg_rabbit_quorum_queues) }}"
|
||||||
glance_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}"
|
glance_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}"
|
||||||
glance_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}"
|
glance_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}"
|
||||||
|
|
||||||
|
@ -79,7 +79,8 @@ policy_dirs = {{ glance_policy_dirs }}
|
|||||||
{% if glance_oslomsg_rpc_transport == 'rabbit' %}
|
{% if glance_oslomsg_rpc_transport == 'rabbit' %}
|
||||||
[oslo_messaging_rabbit]
|
[oslo_messaging_rabbit]
|
||||||
rabbit_quorum_queue = {{ glance_oslomsg_rabbit_quorum_queues }}
|
rabbit_quorum_queue = {{ glance_oslomsg_rabbit_quorum_queues }}
|
||||||
transient_quorum_queue = {{ glance_oslomsg_rabbit_transient_quorum_queues }}
|
rabbit_transient_quorum_queue = {{ glance_oslomsg_rabbit_transient_quorum_queues }}
|
||||||
|
rabbit_qos_prefetch_count = {{ glance_oslomsg_rabbit_qos_prefetch_count }}
|
||||||
use_queue_manager = {{ glance_oslomsg_rabbit_queue_manager }}
|
use_queue_manager = {{ glance_oslomsg_rabbit_queue_manager }}
|
||||||
rabbit_stream_fanout = {{ glance_oslomsg_rabbit_stream_fanout }}
|
rabbit_stream_fanout = {{ glance_oslomsg_rabbit_stream_fanout }}
|
||||||
rabbit_quorum_delivery_limit = {{ glance_oslomsg_rabbit_quorum_delivery_limit }}
|
rabbit_quorum_delivery_limit = {{ glance_oslomsg_rabbit_quorum_delivery_limit }}
|
||||||
|
Loading…
Reference in New Issue
Block a user