From bca28b734d36df43d43e0c0a5a9a253f143da230 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 20 Nov 2024 17:21:08 -0500 Subject: [PATCH] quincy: Use nfs-ganesha 4 This should unbreak the 17.2.8 build. There is a more elegant solution to this overall issue here (https://github.com/ceph/ceph-container/pull/2169) but a lot has changed since then and paths, versions, etc. need to be verified. Signed-off-by: David Galloway --- .../centos-arm64/9/daemon-base/__DOCKERFILE_INSTALL__ | 2 +- .../ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ceph-releases/ALL/centos-arm64/9/daemon-base/__DOCKERFILE_INSTALL__ b/ceph-releases/ALL/centos-arm64/9/daemon-base/__DOCKERFILE_INSTALL__ index 51d29e1ff..d690342cc 100644 --- a/ceph-releases/ALL/centos-arm64/9/daemon-base/__DOCKERFILE_INSTALL__ +++ b/ceph-releases/ALL/centos-arm64/9/daemon-base/__DOCKERFILE_INSTALL__ @@ -12,7 +12,7 @@ bash -c ' \ elif [[ "${CEPH_VERSION}" == quincy ]]; then \ echo "[ganesha]" > /etc/yum.repos.d/ganesha.repo ; \ echo "name=ganesha" >> /etc/yum.repos.d/ganesha.repo ; \ - echo "baseurl=https://buildlogs.centos.org/centos/\$releasever/storage/\$basearch/nfsganesha-4/" >> /etc/yum.repos.d/ganesha.repo ; \ + echo "baseurl=https://mirror.stream.centos.org/SIGs/\$releasever-stream/storage/\$basearch/nfsganesha-4/" >> /etc/yum.repos.d/ganesha.repo ; \ echo "gpgcheck=0" >> /etc/yum.repos.d/ganesha.repo ; \ echo "enabled=1" >> /etc/yum.repos.d/ganesha.repo ; \ elif [[ "${CEPH_VERSION}" == pacific ]]; then \ diff --git a/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ b/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ index 6c0945cd7..051fd6feb 100644 --- a/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ +++ b/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ @@ -2,12 +2,19 @@ yum install -y epel-release && \ yum install -y jq && \ bash -c ' \ if [ -n "__GANESHA_PACKAGES__" ]; then \ - if [[ "${CEPH_VERSION}" =~ master|main|quincy|reef|squid ]]; then \ + if [[ "${CEPH_VERSION}" =~ master|main|reef|squid ]]; then \ echo "[ganesha]" > /etc/yum.repos.d/ganesha.repo ; \ echo "name=ganesha" >> /etc/yum.repos.d/ganesha.repo ; \ echo "baseurl=https://buildlogs.centos.org/centos/\$releasever-stream/storage/\$basearch/nfsganesha-5/" >> /etc/yum.repos.d/ganesha.repo ; \ echo "gpgcheck=0" >> /etc/yum.repos.d/ganesha.repo ; \ echo "enabled=1" >> /etc/yum.repos.d/ganesha.repo ; \ + elif [[ "${{CEPH_VERSION}}" == quincy ]]; then \ + echo "[ganesha]" > /etc/yum.repos.d/ganesha.repo ; \ + echo "name=ganesha" >> /etc/yum.repos.d/ganesha.repo ; \ + echo "baseurl=https://vault.centos.org/\$releasever-stream/storage/\$basearch/nfsganesha-4/" >> /etc/yum.repos.d/ganesha.repo ; \ + echo "baseurl=https://mirror.stream.centos.org/SIGs/\$releasever-stream/storage/\$basearch/nfsganesha-4/" >> /etc/yum.repos.d/ganesha.repo ; \ + echo "gpgcheck=0" >> /etc/yum.repos.d/ganesha.repo ; \ + echo "enabled=1" >> /etc/yum.repos.d/ganesha.repo ; \ elif [[ "${CEPH_VERSION}" == pacific ]]; then \ echo "[ganesha]" > /etc/yum.repos.d/ganesha.repo ; \ echo "name=ganesha" >> /etc/yum.repos.d/ganesha.repo ; \