Remove HA queues defenition

With upgrade of RabbitMQ to 4.0 there're no more HA Queues, which
means that removing such policy as a whole is pre-requisite for
such upgrade.

Change-Id: I6c4657b195eca8ef5d7403acb2d1b5e5078f8cfb
This commit is contained in:
Dmitriy Rabotyagov 2024-11-04 15:12:17 +01:00
parent 32c6aa2cec
commit ce98ae273f
5 changed files with 17 additions and 37 deletions

View File

@ -25,16 +25,10 @@ rabbitmq_servers: >-
| list | join(',') | list | join(',')
}} }}
# If you do not want to use neither quorum queues nor classic mirror queues, # If you do not want to use quorum queues, set rabbitmq_queue_replication to False
# set rabbitmq_queue_replication to False
rabbitmq_queue_replication: True rabbitmq_queue_replication: True
rabbitmq_policies: rabbitmq_policies:
- name: "HA"
pattern: '^(?!(amq\.)|(.*_fanout_)).*'
priority: 0
tags: "ha-mode=all"
state: "{{ (oslomsg_rabbit_quorum_queues | default(True) or not rabbitmq_queue_replication) | ternary('absent', 'present') }}"
- name: CQv2 - name: CQv2
pattern: '.*' pattern: '.*'
priority: 0 priority: 0

View File

@ -0,0 +1,16 @@
---
upgrade:
- |
As RabbitMQ HA (mirrored) queues are no longer supported with current
version of RabbitMQ, please make sure a migration to Quorum Queues was
performed before proceeding with the upgrade.
Please check the `Migrate between HA and Quorum Queues <https://docs.openstack.org/openstack-ansible/latest/admin/maintenance-tasks.html#migrate-between-ha-and-quorum-queues>`_
documentation for more details on the migration path.
deprecations:
- |
RabbitMQ HA (mirrored) queues are no longer supported by RabbitMQ,
so respective policy was deprecated and removed in favor of quorum queues.
Migration to Quorum Queues is expected to be performed on 2024.1 (Caracal)
release.
Please check the `Migrate between HA and Quorum Queues <https://docs.openstack.org/openstack-ansible/latest/admin/maintenance-tasks.html#migrate-between-ha-and-quorum-queues>`_
documentation for more details on the migration path.

View File

@ -357,10 +357,6 @@ glance_default_store:
type: cinder type: cinder
{% endif %} {% endif %}
{% if 'haqueues' in bootstrap_host_scenarios_expanded %}
oslomsg_rabbit_quorum_queues: False
{% endif %}
# NOTE(jrosser) nested virt is not usable in general in opendev.org CI jobs, # NOTE(jrosser) nested virt is not usable in general in opendev.org CI jobs,
# but if the keyword 'kvm' or 'qemu' is present in the expanded scenario then # but if the keyword 'kvm' or 'qemu' is present in the expanded scenario then
# force the use of that virtualisation type. If neither is specified, # force the use of that virtualisation type. If neither is specified,

View File

@ -430,17 +430,6 @@
nodeset: ubuntu-noble nodeset: ubuntu-noble
timeout: 10800 timeout: 10800
- job:
name: openstack-ansible-deploy-aio_metal_haqueues-ubuntu-noble
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-noble
- job:
name: openstack-ansible-upgrade-aio_metal_haqueues-ubuntu-noble
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-noble
timeout: 10800
- job: - job:
name: openstack-ansible-upgrade-aio_lxc-ubuntu-noble name: openstack-ansible-upgrade-aio_lxc-ubuntu-noble
parent: openstack-ansible-deploy-aio parent: openstack-ansible-deploy-aio
@ -583,17 +572,6 @@
nodeset: ubuntu-jammy nodeset: ubuntu-jammy
timeout: 10800 timeout: 10800
- job:
name: openstack-ansible-deploy-aio_metal_haqueues-ubuntu-jammy
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-jammy
- job:
name: openstack-ansible-upgrade-aio_metal_haqueues-ubuntu-jammy
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-jammy
timeout: 10800
- job: - job:
name: openstack-ansible-upgrade-aio_lxc-ubuntu-jammy name: openstack-ansible-upgrade-aio_lxc-ubuntu-jammy
parent: openstack-ansible-deploy-aio parent: openstack-ansible-deploy-aio

View File

@ -191,9 +191,7 @@
- openstack-ansible-deploy-aio_metal-ubuntu-noble - openstack-ansible-deploy-aio_metal-ubuntu-noble
- openstack-ansible-deploy-aio_metal_tls-rockylinux-9 - openstack-ansible-deploy-aio_metal_tls-rockylinux-9
- openstack-ansible-deploy-aio_metal_tls-ubuntu-jammy - openstack-ansible-deploy-aio_metal_tls-ubuntu-jammy
- openstack-ansible-deploy-aio_metal_haqueues-ubuntu-jammy
- openstack-ansible-deploy-aio_metal_tls-ubuntu-noble - openstack-ansible-deploy-aio_metal_tls-ubuntu-noble
- openstack-ansible-deploy-aio_metal_haqueues-ubuntu-noble
- openstack-ansible-upgrade-aio_metal-rockylinux-9 - openstack-ansible-upgrade-aio_metal-rockylinux-9
- openstack-ansible-upgrade-aio_metal-ubuntu-jammy - openstack-ansible-upgrade-aio_metal-ubuntu-jammy
- openstack-ansible-upgrade-aio_metal_tls-rockylinux-9 - openstack-ansible-upgrade-aio_metal_tls-rockylinux-9
@ -204,9 +202,7 @@
- openstack-ansible-deploy-aio_metal-debian-bookworm - openstack-ansible-deploy-aio_metal-debian-bookworm
- openstack-ansible-deploy-aio_metal-rockylinux-9 - openstack-ansible-deploy-aio_metal-rockylinux-9
- openstack-ansible-deploy-aio_metal-ubuntu-jammy - openstack-ansible-deploy-aio_metal-ubuntu-jammy
- openstack-ansible-deploy-aio_metal_haqueues-ubuntu-jammy
- openstack-ansible-deploy-aio_metal-ubuntu-noble - openstack-ansible-deploy-aio_metal-ubuntu-noble
- openstack-ansible-deploy-aio_metal_haqueues-ubuntu-noble
- openstack-ansible-deploy-aio_metal_tls-rockylinux-9 - openstack-ansible-deploy-aio_metal_tls-rockylinux-9
- openstack-ansible-deploy-aio_metal_tls-ubuntu-jammy - openstack-ansible-deploy-aio_metal_tls-ubuntu-jammy
- openstack-ansible-deploy-aio_metal_tls-ubuntu-noble - openstack-ansible-deploy-aio_metal_tls-ubuntu-noble