From 33c988a6ce9fc3fe86d32d0bb97f6cb5130bf2f2 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 22 Nov 2023 05:52:05 +0000 Subject: Update Ceph repo name for dnf config-manager command Since change I1bc19f8198da3f9ab2ae2a8864c3349b21b0249e we install the centos-release-ceph-reef package as a dependency, but some code was still expecting the quincy package. Change-Id: I8ebcf815d80f3bead25e0078d69b34e17ad013bd --- docker/base/Dockerfile.j2 | 2 +- docker/base/ci-centos.repo | 6 +++--- docker/base/ci-rocky.repo | 6 +++--- docker/cinder/cinder-base/Dockerfile.j2 | 2 +- docker/manila/manila-share/Dockerfile.j2 | 2 +- docker/nova/nova-compute/Dockerfile.j2 | 2 +- docker/nova/nova-libvirt/Dockerfile.j2 | 2 +- docker/zun/zun-compute/Dockerfile.j2 | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) (limited to 'docker') 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 diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 1a661af78..fa8d2ca48 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='cinder') }} -{{ macros.enable_extra_repos(['ceph']) }} +{{ macros.enable_extra_repos(['ceph', 'epel']) }} {% if base_package_type == 'rpm' %} {% set cinder_base_packages = [ diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2 index 8ed170db4..c87e602e8 100644 --- a/docker/manila/manila-share/Dockerfile.j2 +++ b/docker/manila/manila-share/Dockerfile.j2 @@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.enable_extra_repos(['ceph']) }} +{{ macros.enable_extra_repos(['ceph', 'epel']) }} {% if base_package_type == 'rpm' %} {% set manila_share_packages = [ diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index b2e091aca..085c5c331 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.enable_extra_repos(['ceph', 'libvirt']) }} +{{ macros.enable_extra_repos(['ceph', 'epel', 'libvirt']) }} {% if base_package_type == 'rpm' %} diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 6bf1ee471..5e9a021c2 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='nova', groups='qemu') }} -{{ macros.enable_extra_repos(['ceph', 'libvirt', 'openvswitch']) }} +{{ macros.enable_extra_repos(['ceph', 'epel', 'libvirt', 'openvswitch']) }} {% if base_package_type == 'rpm' %} diff --git a/docker/zun/zun-compute/Dockerfile.j2 b/docker/zun/zun-compute/Dockerfile.j2 index 957e20e31..45964c4a9 100644 --- a/docker/zun/zun-compute/Dockerfile.j2 +++ b/docker/zun/zun-compute/Dockerfile.j2 @@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.enable_extra_repos(['ceph']) }} +{{ macros.enable_extra_repos(['ceph', 'epel']) }} {% set zun_compute_packages = [ 'ceph-common', -- cgit v1.2.3