Merge pull request #335 from stackhpc/upstream/2024.1-2024-10-21

Synchronise 2024.1 with upstream

ansible/kolla-openstack.yml

@@ -65,6 +65,8 @@
       dell-powerconnect: netmiko_dell_powerconnect
       junos: netmiko_juniper
       openvswitch: netmiko_ovs_linux
+      nclu: netmiko_cumulus
+      nvue: netmiko_cumulus_nvue
     ipa_image_name: "ipa"
   pre_tasks:
     - block:

dev/functions

@@ -494,35 +494,11 @@ 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."
 
-    # NOTE(mattcrees): As om_enable_rabbitmq_quorum_queues now defaults to true
-    # from Bobcat, we need to perform a migration to durable queues during
-    # SLURP upgrades from Antelope to Caracal.
-    # TODO(mattcrees): Remove in Dalmatian.
-    if [[ $IS_SLURP == "True" ]]; then
-        migrate_rabbitmq_queues
-    fi
-
     echo "Upgrading Kayobe"
     upgrade_kayobe_venv
 

playbooks/kayobe-overcloud-upgrade-base/run.yml

@@ -84,6 +84,26 @@
 
         # Upgrade Kayobe, and use it to perform an upgrade of the control plane.
 
+        - name: Ensure RabbitMQ is upgraded prior to a SLURP upgrade
+          shell:
+            cmd: dev/rabbitmq-pre-slurp-upgrade.sh &> {{ logs_dir }}/ansible/rabbitmq-pre-slurp-upgrade
+            chdir: "{{ previous_kayobe_src_dir }}"
+            executable: /bin/bash
+          when: is_slurp
+          environment:
+            KAYOBE_CONFIG_SOURCE_PATH: "{{ previous_kayobe_config_src_dir }}"
+            KAYOBE_SOURCE_PATH: "{{ previous_kayobe_src_dir }}"
+
+        - name: Ensure RabbitMQ queues are migrated
+          shell:
+            cmd: dev/rabbitmq-migrate-queues.sh ironic,keystone,neutron,nova &> {{ logs_dir }}/ansible/rabbitmq-migrate-queues
+            chdir: "{{ previous_kayobe_src_dir }}"
+            executable: /bin/bash
+          when: is_slurp
+          environment:
+            KAYOBE_CONFIG_SOURCE_PATH: "{{ previous_kayobe_config_src_dir }}"
+            KAYOBE_SOURCE_PATH: "{{ previous_kayobe_src_dir }}"
+
         - name: Ensure overcloud is upgraded
           shell:
             cmd: "{{ kayobe_src_dir }}/dev/overcloud-upgrade.sh &> {{ logs_dir }}/ansible/overcloud-upgrade"

releasenotes/notes/cumulus-support-ngs-c4a6e6f3d45f5783.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Adds support for using Cumulus switches (NCLU and NVUE) with Networking
+    Generic Switch.