From 9e36b8976657e5aaf285f4ab9f65603ab475fd89 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 20 May 2025 09:21:59 +0000 Subject: Move to CentOS Stream 10 Known missing packages: - mod_auth_mellon - missing SAML support in Keystone/Horizon - built in Kolla COPR - glusterfs-fuse in manila-share - built in Kolla COPR - collectd/telegraf - no opstools repository - redis - needs a switch to valkey - python3-ethtool - not required for neutron-mlnx-agent since 6 years [1] Building packages in Kolla COPR is a temporary solution until these show up in EPEL10. [1]: Id2cae3ac9ff049e9fc8225551f99e1e99a87fc65 Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/951751 Change-Id: I7074fabcf95184fcfd2561648ae1e05acfb0bc11 Signed-off-by: Michal Nasiadka --- docker/base/Dockerfile.j2 | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'docker/base/Dockerfile.j2') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index b3181558c..638aa8a68 100644 --- a/docker/base/Dockerfile.j2 +++ b/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,9 +130,8 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ ] %} {% set base_centos_yum_repo_packages = [ - 'centos-release-ceph-reef', + 'centos-release-ceph-squid', 'centos-release-nfv-openvswitch', - 'centos-release-opstools', 'epel-release', ] %} @@ -146,13 +146,11 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ # 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-ceph-squid', 'centos-nfv-openvswitch', - 'centos-opstools', - 'centos9-nfv-ovs', - 'centos9-opstools', - 'centos9-rabbitmq', - 'centos9-storage', + 'centos10-nfv-ovs', + 'centos10-rabbitmq', + 'centos10-storage', 'epel', 'influxdb', 'opensearch-3.x', -- cgit v1.2.3