diff options
| author | Zuul <zuul@review.opendev.org> | 2025-07-17 11:54:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-07-17 11:54:34 +0000 |
| commit | 5d2dfc0eb9fac7d22a04665173fe650b61985d19 (patch) | |
| tree | 8962ae2c35df1ae753ccaa14e1084e73e02dda66 /docker/base/Dockerfile.j2 | |
| parent | ba2b4bb56415b9bd7b690dcf077bb59cf4083f05 (diff) | |
| parent | 9e36b8976657e5aaf285f4ab9f65603ab475fd89 (diff) | |
| download | kolla-5d2dfc0eb9fac7d22a04665173fe650b61985d19.tar.gz kolla-5d2dfc0eb9fac7d22a04665173fe650b61985d19.zip | |
Merge "Move to CentOS Stream 10"
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 14 |
1 files changed, 6 insertions, 8 deletions
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', |