Remove om_enable_rabbitmq_high_availability

We're going to upgrade RabbitMQ to 4.0, so this option will not longer be supported. Change-Id: Ide75a8c9086798bf4bdf5bc02d4a1be17017884f
2025-02-04 11:02:28 +00:00 · 2025-02-04 11:02:28 +00:00 · 8f0a4f6726
commit 8f0a4f6726
parent 6ca5ed84ba
33 changed files with 7 additions and 121 deletions
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@ -275,8 +275,6 @@ om_enable_rabbitmq_tls: "{{ rabbitmq_enable_tls | bool }}"
 om_rabbitmq_cacert: "{{ rabbitmq_cacert }}"
 om_rabbitmq_qos_prefetch_count: "1"

-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: true
 # Enabling om_enable_rabbitmq_transient_quorum_queue will have no effect
--- a/ansible/roles/aodh/templates/aodh.conf.j2
+++ b/ansible/roles/aodh/templates/aodh.conf.j2
@ -72,9 +72,6 @@ heartbeat_in_pthread = {{ service_name == 'aodh-api' }}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/barbican/templates/barbican.conf.j2
+++ b/ansible/roles/barbican/templates/barbican.conf.j2
@ -92,9 +92,6 @@ heartbeat_in_pthread = false
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/blazar/templates/blazar.conf.j2
+++ b/ansible/roles/blazar/templates/blazar.conf.j2
@ -63,9 +63,6 @@ heartbeat_in_pthread = false
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/ceilometer/templates/ceilometer.conf.j2
+++ b/ansible/roles/ceilometer/templates/ceilometer.conf.j2
@ -44,9 +44,6 @@ heartbeat_in_pthread = false
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/ansible/roles/cinder/templates/cinder.conf.j2
@ -82,9 +82,6 @@ heartbeat_in_pthread = {{ service_name == 'cinder-api' }}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2
+++ b/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2
@ -56,9 +56,6 @@ heartbeat_in_pthread = {{ service_name == 'cloudkitty-api' }}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/cyborg/templates/cyborg.conf.j2
+++ b/ansible/roles/cyborg/templates/cyborg.conf.j2
@ -78,9 +78,6 @@ heartbeat_in_pthread = false
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/designate/templates/designate.conf.j2
+++ b/ansible/roles/designate/templates/designate.conf.j2
@ -101,9 +101,6 @@ heartbeat_in_pthread = false
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/glance/templates/glance-api.conf.j2
+++ b/ansible/roles/glance/templates/glance-api.conf.j2
@ -121,9 +121,6 @@ heartbeat_in_pthread = false
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@ -83,9 +83,6 @@ heartbeat_in_pthread = {{ service_name == 'heat-api' or service_name == 'heat-ap
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/ironic/templates/ironic-inspector.conf.j2
+++ b/ansible/roles/ironic/templates/ironic-inspector.conf.j2
@ -21,9 +21,6 @@ heartbeat_in_pthread = false
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/ironic/templates/ironic.conf.j2
+++ b/ansible/roles/ironic/templates/ironic.conf.j2
@ -52,9 +52,6 @@ heartbeat_in_pthread = {{ service_name == 'ironic-api' }}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/keystone/templates/keystone.conf.j2
+++ b/ansible/roles/keystone/templates/keystone.conf.j2
@ -71,9 +71,6 @@ heartbeat_in_pthread = {{ service_name == 'keystone' }}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/magnum/templates/magnum.conf.j2
+++ b/ansible/roles/magnum/templates/magnum.conf.j2
@ -135,9 +135,6 @@ heartbeat_in_pthread = false
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/manila/templates/manila.conf.j2
+++ b/ansible/roles/manila/templates/manila.conf.j2
@ -65,9 +65,6 @@ heartbeat_in_pthread = false
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/masakari/templates/masakari.conf.j2
+++ b/ansible/roles/masakari/templates/masakari.conf.j2
@ -62,9 +62,6 @@ heartbeat_in_pthread = {{ service_name == 'masakari-api' }}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/mistral/templates/mistral.conf.j2
+++ b/ansible/roles/mistral/templates/mistral.conf.j2
@ -81,9 +81,6 @@ heartbeat_in_pthread = false
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/neutron/templates/neutron.conf.j2
+++ b/ansible/roles/neutron/templates/neutron.conf.j2
@ -140,9 +140,6 @@ heartbeat_in_pthread = false
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/nova-cell/templates/nova.conf.j2
+++ b/ansible/roles/nova-cell/templates/nova.conf.j2
@ -200,9 +200,6 @@ heartbeat_in_pthread = false
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@ -150,9 +150,6 @@ heartbeat_in_pthread = {{ service_name == 'nova-api' }}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/octavia/templates/octavia.conf.j2
+++ b/ansible/roles/octavia/templates/octavia.conf.j2
@ -135,9 +135,6 @@ heartbeat_in_pthread = {{ service_name == 'octavia-api' }}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/prechecks/tasks/service_checks.yml
+++ b/ansible/roles/prechecks/tasks/service_checks.yml
@ -64,13 +64,6 @@
  when:
    - (enable_ceph | default()) | bool

- name: Validate rabbitmq variables
-  run_once: True
-  fail:
-    msg: |
-      Please set only one of om_enable_rabbitmq_high_availability or om_enable_rabbitmq_quorum_queues
-  when: (om_enable_rabbitmq_high_availability | bool) == (om_enable_rabbitmq_quorum_queues | bool)
-
 - name: Validate rabbitmq quorum/stream variables
  run_once: True
  fail:
--- a/ansible/roles/rabbitmq/tasks/deploy.yml
+++ b/ansible/roles/rabbitmq/tasks/deploy.yml
@ -2,8 +2,6 @@
 - import_tasks: version-check.yml

 - include_tasks: remove-ha-all-policy.yml
-  when:
-    - not om_enable_rabbitmq_high_availability | bool

 - import_tasks: config.yml

--- a/ansible/roles/rabbitmq/tasks/precheck.yml
+++ b/ansible/roles/rabbitmq/tasks/precheck.yml
@ -105,30 +105,6 @@
    - not kolla_externally_managed_cert | bool
    - rabbitmq_enable_tls | bool

- block:
-    - name: List RabbitMQ policies
-      become: true
-      command: "{{ kolla_container_engine }} exec rabbitmq rabbitmqctl list_policies --silent"
-      register: rabbitmq_policies
-      changed_when: false
-      check_mode: false
-
-    - name: Check if RabbitMQ HA needs to be configured
-      assert:
-        that: "'ha-all' in rabbitmq_policies.stdout"
-        fail_msg: >
-          om_enable_rabbitmq_high_availability is True but no mirroring policy has been found.
-          Currently the procedure to migrate from transient non-mirrored queues to durable mirrored queues is manual.
-          Please follow the process described here: https://docs.openstack.org/kolla-ansible/latest/reference/message-queues/rabbitmq.html#high-availability.
-          Note that this process may take several hours on larger systems, and may cause a degradation in performance at large scale.
-          If you do not wish to enable this feature, set om_enable_rabbitmq_high_availability to False.
-
-  run_once: true
-  when:
-    - container_facts.containers['rabbitmq'] is defined
-    - om_enable_rabbitmq_high_availability | bool
-  tags: rabbitmq-ha-precheck
-
 - block:
    - name: List RabbitMQ queues
      become: true
--- a/ansible/roles/rabbitmq/tasks/upgrade.yml
+++ b/ansible/roles/rabbitmq/tasks/upgrade.yml
@ -2,8 +2,6 @@
 - import_tasks: version-check.yml

 - include_tasks: remove-ha-all-policy.yml
-  when:
-    - not om_enable_rabbitmq_high_availability | bool

 - import_tasks: config.yml

--- a/ansible/roles/rabbitmq/templates/definitions.json.j2
+++ b/ansible/roles/rabbitmq/templates/definitions.json.j2
@ -10,11 +10,5 @@
    {"user": "{{ role_rabbitmq_user }}", "vhost": "/", "configure": ".*", "write": ".*", "read": ".*"}{% if role_rabbitmq_monitoring_user is defined and role_rabbitmq_monitoring_user %},
    {"user": "{{ role_rabbitmq_monitoring_user }}", "vhost": "/", "configure": "^$", "write": "^$", "read": ".*"}{% endif %}
  ],
-{% if om_enable_rabbitmq_high_availability | bool %}
-  "policies":[
-    {"vhost": "/", "name": "ha-all", "pattern": "^(?!(amq\\.)|(.*_fanout_)|(reply_)).*", "apply-to": "all", "definition": {"ha-mode":{% if rabbitmq_ha_replica_count is not none %}"exactly","ha-params":{{ rabbitmq_ha_replica_count | int }}{% else %}"all"{% endif %}{% if rabbitmq_ha_promote_on_shutdown is not none %},"ha-promote-on-shutdown":"{{ rabbitmq_ha_promote_on_shutdown }}"{% endif %}{% if rabbitmq_message_ttl_ms is not none %},"message-ttl":{{ rabbitmq_message_ttl_ms | int }}{% endif %}{% if rabbitmq_queue_expiry_ms is not none %},"expires":{{ rabbitmq_queue_expiry_ms | int }}{% endif %}}, "priority":0}
-  ]
-{% else %}
  "policies":[]
-{% endif %}
 }
--- a/ansible/roles/tacker/templates/tacker.conf.j2
+++ b/ansible/roles/tacker/templates/tacker.conf.j2
@ -77,9 +77,6 @@ heartbeat_in_pthread = false
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/trove/templates/trove-guestagent.conf.j2
+++ b/ansible/roles/trove/templates/trove-guestagent.conf.j2
@ -21,9 +21,6 @@ username = {{ trove_keystone_user }}
 use_queue_manager = true
 {% endif %}
 heartbeat_in_pthread = false
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/trove/templates/trove.conf.j2
+++ b/ansible/roles/trove/templates/trove.conf.j2
@ -82,9 +82,6 @@ heartbeat_in_pthread = false
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/watcher/templates/watcher.conf.j2
+++ b/ansible/roles/watcher/templates/watcher.conf.j2
@ -68,9 +68,6 @@ heartbeat_in_pthread = false
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/ansible/roles/zun/templates/zun.conf.j2
+++ b/ansible/roles/zun/templates/zun.conf.j2
@ -138,9 +138,6 @@ heartbeat_in_pthread = {{ service_name == 'zun-api' }}
 ssl = true
 ssl_ca_file = {{ om_rabbitmq_cacert }}
 {% endif %}
-{% if om_enable_rabbitmq_high_availability | bool %}
-amqp_durable_queues = true
-{% endif %}
 {% if om_enable_rabbitmq_quorum_queues | bool %}
 rabbit_quorum_queue = true
 {% if om_enable_rabbitmq_stream_fanout | bool %}
--- a/releasenotes/notes/remove-om_enable_rabbitmq_high_availability-0e9ecae0240c516c.yaml
+++ b/releasenotes/notes/remove-om_enable_rabbitmq_high_availability-0e9ecae0240c516c.yaml
@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    Removed the option the option ``om_enable_rabbitmq_high_availability``. If
+    you have not yet migrated to quorum queues, you will need to do so. See
+    docs:
+    https://docs.openstack.org/kolla-ansible/latest/reference/message-queues/rabbitmq.html#high-availability