diff options
| author | Zuul <zuul@review.opendev.org> | 2023-11-22 15:51:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-11-22 15:51:51 +0000 |
| commit | 4e95910a827a2b2675e6f3e4f20a831b0e4fe1d3 (patch) | |
| tree | a6fbe34a8dd25f3607ab07ea44246da8d502e01b /docker/base | |
| parent | c96965dc6e55fdaba1403f7c5ba089dbc3afcd04 (diff) | |
| parent | 33c988a6ce9fc3fe86d32d0bb97f6cb5130bf2f2 (diff) | |
| download | kolla-4e95910a827a2b2675e6f3e4f20a831b0e4fe1d3.tar.gz kolla-4e95910a827a2b2675e6f3e4f20a831b0e4fe1d3.zip | |
Merge "Update Ceph repo name for dnf config-manager command"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/base/ci-centos.repo | 6 | ||||
| -rw-r--r-- | docker/base/ci-rocky.repo | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 0bfebc81b..077e9a81a 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -146,7 +146,7 @@ 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-quincy', + 'centos-ceph-reef', 'centos-nfv-openvswitch', 'centos-opstools', 'centos-rabbitmq-38', diff --git a/docker/base/ci-centos.repo b/docker/base/ci-centos.repo index e15954a9d..2da510742 100644 --- a/docker/base/ci-centos.repo +++ b/docker/base/ci-centos.repo @@ -38,9 +38,9 @@ gpgcheck=1 repo_gpgcheck=0 enabled=0 -[centos-ceph-quincy] -name=(OpenDev mirror) CentOS-$stream - Ceph Quincy -baseurl=http://MIRROR/centos-stream/SIGs/$stream/storage/$basearch/ceph-quincy/ +[centos-ceph-reef] +name=(OpenDev mirror) CentOS-$stream - Ceph Reef +baseurl=http://MIRROR/centos-stream/SIGs/$stream/storage/$basearch/ceph-reef/ gpgcheck=1 enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage diff --git a/docker/base/ci-rocky.repo b/docker/base/ci-rocky.repo index 76fa85efc..736b5fcc1 100644 --- a/docker/base/ci-rocky.repo +++ b/docker/base/ci-rocky.repo @@ -1,6 +1,6 @@ -[centos-ceph-quincy] -name=(OpenDev mirror) CentOS-$stream - Ceph Quincy -baseurl=http://MIRROR/centos-stream/SIGs/$stream/storage/$basearch/ceph-quincy/ +[centos-ceph-reef] +name=(OpenDev mirror) CentOS-$stream - Ceph Reef +baseurl=http://MIRROR/centos-stream/SIGs/$stream/storage/$basearch/ceph-reef/ gpgcheck=1 enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage |