diff --git a/defaults/main.yml b/defaults/main.yml index ea1795c1..ac118388 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -166,9 +166,10 @@ keystone_oslomsg_notify_policies: [] ## RabbitMQ integration 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_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_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}" diff --git a/templates/keystone.conf.j2 b/templates/keystone.conf.j2 index be519493..81e020bf 100644 --- a/templates/keystone.conf.j2 +++ b/templates/keystone.conf.j2 @@ -29,7 +29,8 @@ transport_url = {{ keystone_oslomsg_rpc_transport }}://{% for host in keystone_o [oslo_messaging_rabbit] 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 }} rabbit_stream_fanout = {{ keystone_oslomsg_rabbit_stream_fanout }} rabbit_quorum_delivery_limit = {{ keystone_oslomsg_rabbit_quorum_delivery_limit }}