diff --git a/defaults/main.yml b/defaults/main.yml index 0202c97f..f30fefeb 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -143,9 +143,10 @@ glance_oslomsg_notify_policies: [] ## RabbitMQ integration 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_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_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}" diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2 index 3243df34..0a667fc6 100644 --- a/templates/glance-api.conf.j2 +++ b/templates/glance-api.conf.j2 @@ -79,7 +79,8 @@ policy_dirs = {{ glance_policy_dirs }} {% if glance_oslomsg_rpc_transport == 'rabbit' %} [oslo_messaging_rabbit] 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 }} rabbit_stream_fanout = {{ glance_oslomsg_rabbit_stream_fanout }} rabbit_quorum_delivery_limit = {{ glance_oslomsg_rabbit_quorum_delivery_limit }}