Merge pull request #392 from stackhpc/upstream/master-2025-03-24

Synchronise master with upstream

Author: bbezak

.zuul.d/centos.yaml

@@ -22,7 +22,7 @@
 - job:
     name: kolla-build-centos9s-aarch64
     parent: kolla-build-centos9s
-    nodeset: kolla-centos-9-stream
+    nodeset: kolla-centos-9-stream-aarch64
     vars:
       base_arch: aarch64
     voting: false

.zuul.d/debian.yaml

@@ -49,8 +49,7 @@
 - job:
     name: kolla-build-debian-aarch64
     parent: kolla-build-debian
-    # NOTE(mnasiadka): Switch to aarch64 nodeset when nodes are fixed
-    nodeset: kolla-debian-bookworm
+    nodeset: kolla-debian-bookworm-aarch64
     voting: false
     vars:
       base_arch: aarch64

.zuul.d/rocky.yaml

@@ -69,7 +69,7 @@
 - job:
     name: kolla-build-rocky9-aarch64
     parent: kolla-build-rocky9
-    nodeset: kolla-rockylinux-9
+    nodeset: kolla-rockylinux-9-aarch64
     vars:
       base_arch: aarch64
     voting: false

.zuul.d/ubuntu.yaml

@@ -69,7 +69,7 @@
 - job:
     name: kolla-build-ubuntu-aarch64
     parent: kolla-build-ubuntu
-    nodeset: kolla-ubuntu-noble
+    nodeset: kolla-ubuntu-noble-aarch64
     vars:
       base_arch: aarch64
     voting: false

README.rst

@@ -92,7 +92,6 @@ Kolla provides images to deploy the following OpenStack projects:
 - `Nova <https://docs.openstack.org/nova/latest/>`__
 - `Octavia <https://docs.openstack.org/octavia/latest/>`__
 - Skyline (`APIServer <https://docs.openstack.org/skyline-apiserver/latest/>`__ and `Console <https://docs.openstack.org/skyline-console/latest/>`__)
-- `Swift <https://docs.openstack.org/swift/latest/>`__
 - `Tacker <https://docs.openstack.org/tacker/latest/>`__
 - `Trove <https://docs.openstack.org/trove/latest/>`__
 - `Venus <https://docs.openstack.org/venus/latest/>`__

doc/source/matrix_aarch64.csv

@@ -48,7 +48,6 @@ prometheus,U,U,U
 rabbitmq,U,U,U
 redis,U,U,U
 skyline,U,U,U
-swift,U,U,U
 tacker,U,U,U
 telegraf,N,N,N
 tgtd,U,U,U

doc/source/support_matrix.rst

@@ -62,9 +62,7 @@ Please see :ref:`unbuildable-images-list`
 Deprecations
 ============
 
-.. note::
-   The swift Kolla images are currently deprecated with removal planned
-   in the 2025.2 cycle.
+None
 
 x86_64 images
 =============

docker/kolla-toolbox/Dockerfile.j2

@@ -120,14 +120,12 @@ if [ "$fail" -eq 1 ]; then exit 1; fi
 ENV ANSIBLE_LIBRARY /usr/share/ansible:$ANSIBLE_LIBRARY
 {% endblock %}
 
-COPY find_disks.py /usr/share/ansible/
 COPY ansible.cfg /etc/ansible/ansible.cfg
 COPY ansible_sudoers /etc/sudoers.d/kolla_ansible_sudoers
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 COPY kolla_toolbox.sh /usr/local/bin/kolla_toolbox
 
-RUN chmod 644 /usr/share/ansible/find_disks.py \
-              /etc/ansible/ansible.cfg \
+RUN chmod 644 /etc/ansible/ansible.cfg \
               /usr/local/bin/kolla_extend_start \
     && chmod 755 /usr/local/bin/kolla_toolbox \
     && chmod 440 /etc/sudoers.d/kolla_ansible_sudoers