Merge "Add oslo.messaging Queue Manager"

ansible/group_vars/all.yml

@@ -277,7 +277,7 @@ om_rabbitmq_cacert: "{{ rabbitmq_cacert }}"
 om_enable_rabbitmq_high_availability: false
 # Only enable quorum queues if you disable om_enable_rabbitmq_high_availability
 om_enable_rabbitmq_quorum_queues: true
-om_enable_queue_manager: false
+om_enable_queue_manager: true
 
 ####################
 # Networking options

ansible/roles/aodh/templates/aodh.conf.j2

@@ -61,6 +61,12 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% if service_name == 'aodh-api' %}
+processname = {{ service_name }}
+{% endif %}
+{% endif %}
 heartbeat_in_pthread = {{ service_name == 'aodh-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/barbican/templates/barbican.conf.j2

@@ -84,6 +84,9 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/blazar/templates/blazar.conf.j2

@@ -55,6 +55,9 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/ceilometer/templates/ceilometer.conf.j2

@@ -36,6 +36,9 @@ ca_file = /etc/ceilometer/vmware_ca
 transport_url = {{ notify_transport_url }}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/cinder/templates/cinder.conf.j2

@@ -79,6 +79,12 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% if service_name == 'cinder-api' %}
+processname = {{ service_name }}
+{% endif %}
+{% endif %}
 heartbeat_in_pthread = {{ service_name == 'cinder-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/cloudkitty/templates/cloudkitty.conf.j2

@@ -45,6 +45,12 @@ policy_file = {{ cloudkitty_policy_file }}
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% if service_name == 'cloudkitty-api' %}
+processname = {{ service_name }}
+{% endif %}
+{% endif %}
 heartbeat_in_pthread = {{ service_name == 'cloudkitty-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/cyborg/templates/cyborg.conf.j2

@@ -70,6 +70,9 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/designate/templates/designate.conf.j2

@@ -93,6 +93,9 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/glance/templates/glance-api.conf.j2

@@ -125,6 +125,9 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/heat/templates/heat.conf.j2

@@ -72,6 +72,12 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% if service_name == 'heat-api' or service_name == 'heat-api-cfn' %}
+processname = {{ service_name }}
+{% endif %}
+{% endif %}
 heartbeat_in_pthread = {{ service_name == 'heat-api' or service_name == 'heat-api-cfn' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/ironic/templates/ironic-inspector.conf.j2

@@ -13,6 +13,9 @@ transport_url = {{ rpc_transport_url }}
 transport_url = {{ notify_transport_url }}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/ironic/templates/ironic.conf.j2

@@ -43,6 +43,10 @@ backend = collector
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+processname = {{ service_name }}
+{% endif %}
 heartbeat_in_pthread = {{ service_name == 'ironic-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/keystone/templates/keystone.conf.j2

@@ -60,6 +60,12 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% if service_name == 'keystone-api' %}
+processname = {{ service_name }}
+{% endif %}
+{% endif %}
 heartbeat_in_pthread = {{ service_name == 'keystone' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/magnum/templates/magnum.conf.j2

@@ -127,6 +127,9 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/manila/templates/manila.conf.j2

@@ -57,6 +57,9 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/masakari/templates/masakari.conf.j2

@@ -51,6 +51,12 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% if service_name == 'masakari-api' %}
+processname = {{ service_name }}
+{% endif %}
+{% endif %}
 heartbeat_in_pthread = {{ service_name == 'masakari-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/mistral/templates/mistral.conf.j2

@@ -73,6 +73,9 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/neutron/templates/neutron.conf.j2

@@ -132,6 +132,9 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/nova-cell/tasks/discover_computes.yml

@@ -14,7 +14,7 @@
     - name: Discover nova hosts
       become: true
       command: >
-        {{ kolla_container_engine }} exec nova_conductor nova-manage cell_v2 discover_hosts --by-service --cell_uuid {{ nova_cell_settings.cell_uuid }}
+        {{ kolla_container_engine }} exec -t nova_conductor nova-manage cell_v2 discover_hosts --by-service --cell_uuid {{ nova_cell_settings.cell_uuid }}
       changed_when: False
 
   # Delegate to a cell conductor.

ansible/roles/nova-cell/templates/nova.conf.j2

@@ -189,6 +189,12 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% if service_name == "nova-compute-ironic" %}
+hostname = {{ nova_compute_ironic_custom_host | default(ansible_facts.hostname) }}-ironic
+{% endif %}
+{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/nova/templates/nova.conf.j2

@@ -139,6 +139,12 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% if service_name == 'nova-api' or service_name == 'nova-metadata' %}
+processname = {{ service_name }}
+{% endif %}
+{% endif %}
 heartbeat_in_pthread = {{ service_name == 'nova-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/octavia/templates/octavia.conf.j2

@@ -123,6 +123,12 @@ rpc_thread_pool_size = 2
 transport_url = {{ notify_transport_url }}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% if service_name == 'octavia-api' %}
+processname = {{ service_name }}
+{% endif %}
+{% endif %}
 heartbeat_in_pthread = {{ service_name == 'octavia-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/rabbitmq/tasks/precheck.yml

@@ -150,7 +150,7 @@
       loop_control:
         label: "{{ item.name }}"
       # TODO(mattcress): remove skipping reply and fanout once https://review.opendev.org/c/openstack/oslo.messaging/+/888479 is merged.
-      when: not (item.name is search('reply_') or item.name is search('_fanout_'))
+      when: not (item.name is search('reply_') or item.name is search('_fanout'))
 
   run_once: true
   when:

ansible/roles/tacker/templates/tacker.conf.j2

@@ -69,6 +69,9 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/trove/templates/trove-guestagent.conf.j2

@@ -17,6 +17,9 @@ user_domain_name = {{ default_user_domain_name }}
 username = {{ trove_keystone_user }}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_high_availability | bool %}
 amqp_durable_queues = true

ansible/roles/trove/templates/trove.conf.j2

@@ -75,6 +75,9 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/watcher/templates/watcher.conf.j2

@@ -60,6 +60,9 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% endif %}
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

ansible/roles/zun/templates/zun.conf.j2

@@ -127,6 +127,12 @@ docker_remote_api_port = 2375
 cni_daemon_port = {{ zun_cni_daemon_port }}
 
 [oslo_messaging_rabbit]
+{% if om_enable_queue_manager | bool %}
+use_queue_manager = true
+{% if service_name == 'zun-api' %}
+processname = {{ service_name }}
+{% endif %}
+{% endif %}
 heartbeat_in_pthread = {{ service_name == 'zun-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

releasenotes/notes/add-queue-manager-3ce79655ac37c345.yaml

@@ -0,0 +1,11 @@
+---
+features:
+  - |
+    Added support for using oslo.messaging Queue Manager to all services which
+    use RabbitMQ. This is enabled by default, but can be configured using
+    ``om_enable_queue_manager``.
+upgrade:
+  - |
+    Added support for using oslo.messaging Queue Manager to all services which
+    use RabbitMQ. This is enabled by default, but can be configured using
+    ``om_enable_queue_manager``.