Merge pull request #503 from stackhpc/upstream/2024.1-2025-12-02

Synchronise 2024.1 with upstream

Author: priteau

.gitreview

@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/kayobe.git
-defaultbranch=stable/2024.1
+defaultbranch=unmaintained/2024.1

ansible/inventory/group_vars/all/openstack

@@ -5,9 +5,9 @@
 # Name of the current OpenStack release. Default is "2024.1".
 openstack_release: "2024.1"
 
-# Name of the current OpenStack branch. Default is "stable/2024.1".
+# Name of the current OpenStack branch. Default is "unmaintained/2024.1".
 openstack_branch: >-
-  {% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }}
+  {% if openstack_release != 'master' %}unmaintained/{% endif %}{{ openstack_release | lower }}
 
 ###############################################################################
 # OpenStack authentication configuration.

etc/kayobe/openstack.yml

@@ -5,7 +5,7 @@
 # Name of the current OpenStack release. Default is "2024.1".
 #openstack_release:
 
-# Name of the current OpenStack branch. Default is "stable/2024.1".
+# Name of the current OpenStack branch. Default is "unmaintained/2024.1".
 #openstack_branch:
 
 ###############################################################################

requirements.yml

@@ -2,7 +2,7 @@
 collections:
   - name: https://opendev.org/openstack/ansible-collection-kolla
     type: git
-    version: stable/2024.1
+    version: unmaintained/2024.1
   - name: dellemc.os10
     version: 1.1.1
   - name: nvidia.nvue

zuul.d/jobs.yaml

@@ -71,19 +71,11 @@
     required-projects:
       # Include kayobe to ensure other projects can use this job.
       - name: openstack/ansible-collection-kolla
-        # TODO(priteau): Remove when kayobe stable/2024.1 exists.
-        override-checkout: stable/2024.1
       - name: openstack/kayobe
       - name: openstack/kayobe-config-dev
       - name: openstack/kolla
-        # TODO(priteau): Remove when kayobe stable/2024.1 exists.
-        override-checkout: stable/2024.1
       - name: openstack/kolla-ansible
-        # TODO(priteau): Remove when kayobe stable/2024.1 exists.
-        override-checkout: stable/2024.1
       - name: openstack/requirements
-        # TODO(priteau): Remove when kayobe stable/2024.1 exists.
-        override-checkout: stable/2024.1
       - name: openstack/tenks
     irrelevant-files:
       - ^\..+

zuul.d/project.yaml

@@ -20,15 +20,9 @@
         - kayobe-overcloud-host-configure-centos9s
         - kayobe-overcloud-host-configure-ubuntu-jammy
         - kayobe-overcloud-host-configure-ubuntu-noble
-        - kayobe-overcloud-upgrade-slurp-rocky9:
-            voting: false
-        - kayobe-overcloud-upgrade-slurp-ubuntu-jammy:
-            voting: false
         - kayobe-seed-rocky9
         - kayobe-seed-ubuntu-jammy
         - kayobe-seed-ubuntu-noble
-        - kayobe-seed-upgrade-slurp-rocky9
-        - kayobe-seed-upgrade-slurp-ubuntu-jammy
         - kayobe-seed-vm-rocky9
         - kayobe-seed-vm-rocky9-efi
         - kayobe-seed-vm-ubuntu-jammy
@@ -57,8 +51,6 @@
         - kayobe-seed-rocky9
         - kayobe-seed-ubuntu-jammy
         - kayobe-seed-ubuntu-noble
-        - kayobe-seed-upgrade-slurp-rocky9
-        - kayobe-seed-upgrade-slurp-ubuntu-jammy
         - kayobe-seed-vm-rocky9
         - kayobe-seed-vm-ubuntu-jammy
         - kayobe-seed-vm-ubuntu-noble