From e10446837113bbd65d6d84b38082797953282297 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Wed, 30 Aug 2023 09:37:52 +0100 Subject: [PATCH] CI: Migrate RabbitMQ queues during upgrade tasks Kolla Ansible enabled RabbitMQ HA queues by default, which require a manual migration step [1]. Adds these to the Kayobe upgrade CI. [1] https://review.opendev.org/c/openstack/kolla-ansible/+/882825 Change-Id: I82c286fd17e3a1d7f31952442fa281302cda7ee4 --- dev/functions | 18 ++++++++++++++++++ .../globals.yml.j2 | 4 ---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dev/functions b/dev/functions index 3eda21475..7b78b22ed 100644 --- a/dev/functions +++ b/dev/functions @@ -488,11 +488,29 @@ function overcloud_deploy { echo "Control plane deployment complete" } +function migrate_rabbitmq_queues { + echo "Migrating to RabbitMQ HA queues" + + environment_setup + + kayobe overcloud service configuration generate --node-config-dir /etc/kolla + + kayobe kolla ansible run "stop --yes-i-really-really-mean-it" -kt ironic,keystone,neutron,nova + + kayobe overcloud service upgrade -kt rabbitmq --skip-prechecks + + kayobe kolla ansible run rabbitmq-reset-state + + kayobe kolla ansible run deploy -kt ironic,keystone,neutron,nova +} + function overcloud_upgrade { # Upgrade a kayobe control plane. echo "Upgrading a kayobe development environment. This consists of a " echo "single node OpenStack control plane." + migrate_rabbitmq_queues + echo "Upgrading Kayobe" upgrade_kayobe_venv diff --git a/playbooks/kayobe-overcloud-upgrade-base/globals.yml.j2 b/playbooks/kayobe-overcloud-upgrade-base/globals.yml.j2 index d84e51b23..6dc842c47 100644 --- a/playbooks/kayobe-overcloud-upgrade-base/globals.yml.j2 +++ b/playbooks/kayobe-overcloud-upgrade-base/globals.yml.j2 @@ -14,7 +14,3 @@ openstack_service_rpc_workers: "1" # Reduce size of libvirt logs when OpenStack debug logging is enabled nova_libvirt_logging_debug: False - -# TODO(priteau): Replace with steps to migrate RabbitMQ transient non-mirrored -# queues to durable mirrored queues for 2023.1 to 2023.2 upgrade jobs. -om_enable_rabbitmq_high_availability: true