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 ++++++-------- docker/base/ci-centos.repo | 10 +++++----- docker/base/influxdb.repo | 3 ++- docker/base/kolla_el10.repo | 10 ++++++++++ docker/base/proxysql.repo | 3 ++- docker/base/td.repo | 3 ++- 6 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 docker/base/kolla_el10.repo (limited to 'docker/base') 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', diff --git a/docker/base/ci-centos.repo b/docker/base/ci-centos.repo index a8decf252..4c08f1fea 100644 --- a/docker/base/ci-centos.repo +++ b/docker/base/ci-centos.repo @@ -1,6 +1,6 @@ [baseos] name=(OpenDev mirror) CentOS Stream $releasever - BaseOS -baseurl=http://MIRROR/centos-stream/9-stream/BaseOS/$basearch/os/ +baseurl=http://MIRROR/centos-stream/$stream/BaseOS/$basearch/os/ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial gpgcheck=1 repo_gpgcheck=0 @@ -8,7 +8,7 @@ enabled=1 [appstream] name=(OpenDev mirror) CentOS Stream $releasever - AppStream -baseurl=http://MIRROR/centos-stream/9-stream/AppStream/$basearch/os/ +baseurl=http://MIRROR/centos-stream/$stream/AppStream/$basearch/os/ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial gpgcheck=1 repo_gpgcheck=0 @@ -16,7 +16,7 @@ enabled=1 [extras-common] name=(OpenDev mirror) CentOS Stream $releasever - Extras packages -baseurl=http://MIRROR/centos-stream/SIGs/9-stream/extras/$basearch/extras-common/ +baseurl=http://MIRROR/centos-stream/SIGs/$stream/extras/$basearch/extras-common/ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Extras-SHA512 gpgcheck=1 repo_gpgcheck=0 @@ -24,7 +24,7 @@ enabled=1 [crb] name=(OpenDev mirror) CentOS Stream $releasever - CRB -baseurl=http://MIRROR/centos-stream/9-stream/CRB/$basearch/os/ +baseurl=http://MIRROR/centos-stream/$stream/CRB/$basearch/os/ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial gpgcheck=1 repo_gpgcheck=0 @@ -32,7 +32,7 @@ enabled=0 [highavailability] name=(OpenDev mirror) CentOS Stream $releasever - HighAvailability -baseurl=http://MIRROR/centos-stream/9-stream/HighAvailability/$basearch/os/ +baseurl=http://MIRROR/centos-stream/$stream/HighAvailability/$basearch/os/ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial gpgcheck=1 repo_gpgcheck=0 diff --git a/docker/base/influxdb.repo b/docker/base/influxdb.repo index b060ab85c..ece571b2b 100644 --- a/docker/base/influxdb.repo +++ b/docker/base/influxdb.repo @@ -1,6 +1,7 @@ [influxdb] name = InfluxDB Repository - RHEL $releasever -baseurl = https://repos.influxdata.com/rhel/$releasever/$basearch/stable +# NOTE(mnasiadka): Use EL9 for now, 10 is not available yet +baseurl = https://repos.influxdata.com/rhel/9/$basearch/stable enabled = 0 gpgcheck = 1 gpgkey = https://repos.influxdata.com/influxdata-archive_compat.key diff --git a/docker/base/kolla_el10.repo b/docker/base/kolla_el10.repo new file mode 100644 index 000000000..b1ffee675 --- /dev/null +++ b/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 diff --git a/docker/base/proxysql.repo b/docker/base/proxysql.repo index 3c09fa7ff..1bd2c55c3 100644 --- a/docker/base/proxysql.repo +++ b/docker/base/proxysql.repo @@ -1,6 +1,7 @@ [proxysql] name = ProxySQL -baseurl = https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/almalinux/$releasever +# NOTE(mnasiadka): No EL10 packages yet +baseurl = https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/almalinux/9 gpgkey = https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/repo_pub_key gpgcheck = 1 enabled = 0 diff --git a/docker/base/td.repo b/docker/base/td.repo index e06b62991..8212817fa 100644 --- a/docker/base/td.repo +++ b/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 -- cgit v1.2.3