From ce98ae273f61d090c8c5ab68dfab721fc5d60ad3 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 4 Nov 2024 15:12:17 +0100 Subject: [PATCH] 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 --- inventory/group_vars/all/infra.yml | 8 +------ .../ha_queues_removed-4e4d3fe5ed74a242.yaml | 16 ++++++++++++++ .../templates/user_variables.aio.yml.j2 | 4 ---- zuul.d/jobs.yaml | 22 ------------------- zuul.d/project-templates.yaml | 4 ---- 5 files changed, 17 insertions(+), 37 deletions(-) create mode 100644 releasenotes/notes/ha_queues_removed-4e4d3fe5ed74a242.yaml diff --git a/inventory/group_vars/all/infra.yml b/inventory/group_vars/all/infra.yml index 3e6be2748f..cf1f39ee5d 100644 --- a/inventory/group_vars/all/infra.yml +++ b/inventory/group_vars/all/infra.yml @@ -25,16 +25,10 @@ rabbitmq_servers: >- | list | join(',') }} -# If you do not want to use neither quorum queues nor classic mirror queues, -# set rabbitmq_queue_replication to False +# If you do not want to use quorum queues, set rabbitmq_queue_replication to False rabbitmq_queue_replication: True 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 pattern: '.*' priority: 0 diff --git a/releasenotes/notes/ha_queues_removed-4e4d3fe5ed74a242.yaml b/releasenotes/notes/ha_queues_removed-4e4d3fe5ed74a242.yaml new file mode 100644 index 0000000000..0e815ea5c6 --- /dev/null +++ b/releasenotes/notes/ha_queues_removed-4e4d3fe5ed74a242.yaml @@ -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 `_ + 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 `_ + documentation for more details on the migration path. diff --git a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 index 326c519dfe..f6240945b5 100644 --- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 @@ -357,10 +357,6 @@ glance_default_store: type: cinder {% 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, # 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, diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 2acd689a09..959a651055 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -430,17 +430,6 @@ nodeset: ubuntu-noble 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: name: openstack-ansible-upgrade-aio_lxc-ubuntu-noble parent: openstack-ansible-deploy-aio @@ -583,17 +572,6 @@ nodeset: ubuntu-jammy 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: name: openstack-ansible-upgrade-aio_lxc-ubuntu-jammy parent: openstack-ansible-deploy-aio diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml index 500049ab66..f4549497b0 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -191,9 +191,7 @@ - openstack-ansible-deploy-aio_metal-ubuntu-noble - openstack-ansible-deploy-aio_metal_tls-rockylinux-9 - 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_haqueues-ubuntu-noble - openstack-ansible-upgrade-aio_metal-rockylinux-9 - openstack-ansible-upgrade-aio_metal-ubuntu-jammy - openstack-ansible-upgrade-aio_metal_tls-rockylinux-9 @@ -204,9 +202,7 @@ - openstack-ansible-deploy-aio_metal-debian-bookworm - openstack-ansible-deploy-aio_metal-rockylinux-9 - 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_haqueues-ubuntu-noble - openstack-ansible-deploy-aio_metal_tls-rockylinux-9 - openstack-ansible-deploy-aio_metal_tls-ubuntu-jammy - openstack-ansible-deploy-aio_metal_tls-ubuntu-noble