Synchronise 2025.1 with upstream

.zuul.d/base.yaml

@@ -75,12 +75,24 @@
       - name: primary
         label: centos-9-stream
 
+- nodeset:
+    name: kolla-centos-10-stream
+    nodes:
+      - name: primary
+        label: centos-10-stream-8GB
+
 - nodeset:
     name: kolla-rockylinux-9
     nodes:
       - name: primary
         label: rockylinux-9
 
+- nodeset:
+    name: kolla-rockylinux-10
+    nodes:
+      - name: primary
+        label: rockylinux-10-8GB
+
 - nodeset:
     name: kolla-ubuntu-noble
     nodes:
@@ -99,6 +111,12 @@
       - name: primary
         label: centos-9-stream-arm64
 
+- nodeset:
+    name: kolla-centos-10-stream-aarch64
+    nodes:
+      - name: primary
+        label: centos-10-stream-arm64-8GB
+
 - nodeset:
     name: kolla-debian-bookworm-aarch64
     nodes:
@@ -111,6 +129,12 @@
       - name: primary
         label: rockylinux-9-arm64
 
+- nodeset:
+    name: kolla-rockylinux-10-aarch64
+    nodes:
+      - name: primary
+        label: rockylinux-10-arm64-8GB
+
 - nodeset:
     name: kolla-ubuntu-noble-aarch64
     nodes:

.zuul.d/centos.yaml

@@ -3,13 +3,17 @@
     check:
       jobs:
         - kolla-build-centos9s
+        - kolla-build-centos10s
         - kolla-ansible-centos9s
+        - kolla-ansible-centos10s
     check-arm64:
       jobs:
         - kolla-build-centos9s-aarch64
+        - kolla-build-centos10s-aarch64
     experimental:
       jobs:
         - kolla-build-no-infra-wheels-centos9s
+        - kolla-build-no-infra-wheels-centos10s
 
 - job:
     name: kolla-build-centos9s
@@ -19,6 +23,16 @@
       base_distro: centos
     voting: false
 
+- job:
+    name: kolla-build-centos10s
+    parent: kolla-base
+    nodeset: kolla-centos-10-stream
+    vars:
+      base_distro: centos
+      base_distro_version: 10
+      base_distro_tag: 'stream10'
+    voting: false
+
 - job:
     name: kolla-build-centos9s-aarch64
     parent: kolla-build-centos9s
@@ -27,9 +41,24 @@
       base_arch: aarch64
     voting: false
 
+- job:
+    name: kolla-build-centos10s-aarch64
+    parent: kolla-build-centos10s
+    nodeset: kolla-centos-10-stream-aarch64
+    vars:
+      base_arch: aarch64
+    voting: false
+
 - job:
     name: kolla-build-no-infra-wheels-centos9s
     parent: kolla-build-no-infra-wheels-base
     nodeset: kolla-centos-9-stream
     vars:
       base_distro: centos
+
+- job:
+    name: kolla-build-no-infra-wheels-centos10s
+    parent: kolla-build-no-infra-wheels-base
+    nodeset: kolla-centos-10-stream
+    vars:
+      base_distro: centos

.zuul.d/rocky.yaml

@@ -31,21 +31,30 @@
             files: ^docker/proxysql/
         - kolla-ansible-rocky9-bifrost:
             files: ^docker/bifrost/
+        - kolla-build-rocky10
+        - kolla-build-rocky10-podman
+        #- kolla-ansible-rocky10
     check-arm64:
       jobs:
         - kolla-build-rocky9-aarch64
+        - kolla-build-rocky10-aarch64
     gate:
       jobs:
         - kolla-build-rocky9
         - kolla-build-rocky9-podman
         - kolla-ansible-rocky9
         - kolla-ansible-rocky9-upgrade
+        - kolla-build-rocky10
+        - kolla-build-rocky10-podman
+        #- kolla-ansible-rocky10
     periodic-stable:
       jobs:
         - kolla-publish-rocky9-quay
+        - kolla-publish-rocky10-quay
     experimental:
       jobs:
         - kolla-build-no-infra-wheels-rocky9
+        - kolla-build-no-infra-wheels-rocky10
 
 - job:
     name: kolla-build-rocky9
@@ -101,3 +110,61 @@
     secrets:
       - kolla_quay_io_creds
       - kolla_quay_io_api
+
+- job:
+    name: kolla-build-rocky10
+    parent: kolla-base
+    nodeset: kolla-rockylinux-10
+    vars:
+      base_distro: rocky
+      base_distro_version: 10
+      base_distro_tag: 10
+
+- job:
+    name: kolla-build-rocky10-podman
+    parent: kolla-base-podman
+    nodeset: kolla-rockylinux-10
+    vars:
+      base_distro: rocky
+      base_distro_version: 10
+      base_distro_tag: 10
+
+- job:
+    name: kolla-build-rocky10-aarch64
+    parent: kolla-build-rocky10
+    nodeset: kolla-rockylinux-10-aarch64
+    vars:
+      base_arch: aarch64
+    voting: false
+
+- job:
+    name: kolla-build-no-infra-wheels-rocky10
+    parent: kolla-build-no-infra-wheels-base
+    nodeset: kolla-rockylinux-10
+    vars:
+      base_distro: rocky
+      base_distro_version: 10
+      base_distro_tag: 10
+
+- job:
+    name: kolla-publish-rocky10-dockerhub
+    parent: kolla-build-rocky10
+    post-run: tests/playbooks/publish.yml
+    vars:
+      publisher: true
+      kolla_registry: dockerhub
+      kolla_namespace: kolla
+    secrets:
+      - kolla_dockerhub_credentials
+
+- job:
+    name: kolla-publish-rocky10-quay
+    parent: kolla-build-rocky10
+    post-run: tests/playbooks/publish.yml
+    vars:
+      publisher: true
+      kolla_registry: quay.io
+      kolla_namespace: openstack.kolla
+    secrets:
+      - kolla_quay_io_creds
+      - kolla_quay_io_api

doc/source/ceph_versions.csv

@@ -1,5 +1,6 @@
 Distro,Ceph,
 ,Source, Release
-Rocky Linux,CentOS Storage SIG,Reef
+Rocky Linux 9,CentOS Storage SIG,Reef
+Rocky Linux 10,CentOS Storage SIG,Squid
 Ubuntu,Ubuntu,Squid
 Debian,Debian,Pacific

doc/source/contributor/versions.rst

@@ -10,7 +10,7 @@ For each component used we list version used at branch release and provide
 information about package sources.
 
 .. note::
-    When table mentions 'CentOS' it means both CentOS Stream 9 and Rocky Linux 9.
+    When table mentions 'CentOS' it means both CentOS Stream 9/10 and Rocky Linux 9/10.
 
 ==============  ================  =============================================
  Name           Version           Package source information

doc/source/support_matrix.rst

@@ -22,6 +22,10 @@ Debian Bookworm    debian                          bookworm
 Ubuntu Noble       ubuntu                          24.04
 ================== =============================== ================
 
+.. note::
+
+   Rocky Linux 10 builds are also supported, you need to define base_tag = 10
+
 The remainder of this document outlines which images are supported on which of
 these distribution.
 

docker/base/Dockerfile.j2

@@ -55,6 +55,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
     'docker-ce.repo',
     'grafana.repo',
     'influxdb.repo',
+    'kolla_el10.repo',
     'mariadb.repo',
     'opensearch.repo',
     'proxysql.repo',
@@ -129,13 +130,21 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
 {% set base_centos_yum_repo_keys = [
 ] %}
 
-{% set base_centos_yum_repo_packages = [
-    'centos-release-ceph-reef',
-    'centos-release-nfv-openvswitch',
-    'centos-release-openstack-epoxy',
-    'centos-release-opstools',
-    'epel-release',
-] %}
+{% if base_distro_tag.startswith('10') or base_distro_tag.startswith('stream10') %}
+    {% set base_centos_yum_repo_packages = [
+        'centos-release-ceph-squid',
+        'centos-release-nfv-openvswitch',
+        'epel-release',
+    ] %}
+{% else %}
+    {% set base_centos_yum_repo_packages = [
+        'centos-release-ceph-reef',
+        'centos-release-nfv-openvswitch',
+        'centos-release-openstack-epoxy',
+        'centos-release-opstools',
+        'epel-release',
+    ] %}
+{% endif %}
 
 # We need 'dnf-plugins-core' for 'dnf config-manager'
 {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
@@ -147,15 +156,26 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
 # FIXME(hrw): entries not starting with 'centos-' (and 'centos-nfv-ovs') are
 # from delorean or rdo-release-* package
 # https://review.rdoproject.org/r/c/rdo-infra/ansible-role-dlrn/+/33241
-{% set base_centos_yum_repos_to_disable = [
-    'centos-ceph-reef',
-    'centos-nfv-openvswitch',
-    'centos-opstools',
-    'epel',
-    'influxdb',
-    'opensearch-2.x',
-    'opensearch-dashboards-2.x',
+{% if base_distro_tag.startswith('10') or base_distro_tag.startswith('stream10') %}
+    {% set base_centos_yum_repos_to_disable = [
+        'centos-ceph-squid',
+        'centos-nfv-openvswitch',
+        'epel',
+        'influxdb',
+        'opensearch-2.x',
+        'opensearch-dashboards-2.x',
+    ] %}
+{% else %}
+    {% set base_centos_yum_repos_to_disable = [
+        'centos-ceph-reef',
+        'centos-nfv-openvswitch',
+        'centos-opstools',
+        'epel',
+        'influxdb',
+        'opensearch-2.x',
+        'opensearch-dashboards-2.x',
 ] %}
+{% endif %}
 
 RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}
 
@@ -174,6 +194,11 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
 
 {% block base_redhat_binary_versionlock %}{% endblock %}
 
+{# NOTE(mnasiadka): In EL10 we install dumb-init from epel #}
+{% if base_distro_tag.startswith('10') or base_distro_tag.startswith('stream10') %}
+RUN dnf config-manager --enable epel
+{% endif %}
+
 {# NOTE(hrw): CentOS Stream 9 has curl-minimal, Rocky Linux 9 has curl so we do not install any #}
 {% set base_centos_packages = [
         'ca-certificates',
@@ -186,6 +211,7 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
         'lsof',
         'lvm2',
         'ncurses',
+        'openssl',
         'procps-ng',
         'python3',
         'python3-pip',

docker/base/influxdb.repo

@@ -1,6 +1,7 @@
 [influxdb]
 name = InfluxDB Repository - RHEL $releasever
-baseurl = https://repos.influxdata.com/stable/$basearch/main
+# NOTE(mnasiadka): Use RHEL9 for both 9 and 10
+baseurl = https://repos.influxdata.com/rhel/9/$basearch/stable
 enabled = 0
 gpgcheck = 1
 gpgkey = https://repos.influxdata.com/influxdata-archive.key

docker/base/kolla_el10.repo

@@ -0,0 +1,10 @@
+[kolla_el10]
+name=Copr repo for el10-missing owned by @openstack-kolla
+baseurl=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/el10-missing/epel-10-$basearch/
+type=rpm-md
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/el10-missing/pubkey.gpg
+repo_gpgcheck=0
+enabled=0
+enabled_metadata=1

docker/base/proxysql.repo

@@ -1,6 +1,7 @@
 [proxysql]
 name = ProxySQL
-baseurl = https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/almalinux/$releasever
+# NOTE(mnasiadka): use 9 for both 9 and 10
+baseurl = https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/almalinux/9
 gpgkey = https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/repo_pub_key
 gpgcheck = 1
 enabled = 0

docker/base/td.repo

@@ -1,6 +1,7 @@
 [fluent-package-lts]
 name=Fluentd Project
-baseurl=https://packages.treasuredata.com/lts/5/redhat/$releasever/$basearch
+# NOTE(mnasiadka): Use EL9 packages for now - 10 are not available yet
+baseurl=https://packages.treasuredata.com/lts/5/redhat/9/$basearch
 gpgcheck=1
 gpgkey=https://packages.treasuredata.com/GPG-KEY-td-agent
 enabled=0

docker/ironic/ironic-conductor/Dockerfile.j2

@@ -13,7 +13,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'e2fsprogs',
         'fuse',
         'gdisk',
-        'genisoimage',
         'ipmitool',
         'mtools',
         'openssh-clients',
@@ -25,6 +24,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'util-linux',
         'xfsprogs',
     ] %}
+    {% if base_distro_tag.startswith('10') or base_distro_tag.startswith('stream10') %}
+        {% set ironic_conductor_packages = ironic_conductor_packages + [
+            'xorriso'
+        ] %}
+    {% else %}
+        {% set ironic_conductor_packages = ironic_conductor_packages + [
+            'genisoimage'
+        ] %}
+    {% endif %}
     {% if base_arch in ['x86_64'] %}
         {% set ironic_conductor_packages = ironic_conductor_packages + [
             'syslinux'

docker/keystone/keystone-base/Dockerfile.j2

@@ -7,6 +7,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
+{% if base_distro_tag.startswith('10') or base_distro_tag.startswith('stream10') %}
+    {# NOTE(mnasiadka): mod_auth_mellon missing in CentOS 10 Stream - temporarily from Kolla COPR #}
+    {{ macros.enable_extra_repos(['kolla_el10']) }}
+{% endif %}
+{{ macros.enable_extra_repos(['epel']) }}
+
 {{ macros.configure_user(name='keystone') }}
 
 {% if base_package_type == 'rpm' %}