From 6619587dc279bf49c128ccf81d27879969b58efa Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 20 May 2026 16:38:52 -0400 Subject: [PATCH] Revert "Use GANESHA_REPO_BASEURL for NFS-Ganesha on all distros" The ganesha spec file is calling in a system package that is in CentOS 10 Stream but not yet in Rocky/Alma/RHEL/whatever. This reverts commit 1163bd6b01560bb435821d1ec14b69a5a4f3b0cc. Fixes: https://tracker.ceph.com/issues/76681 Signed-off-by: David Galloway --- container/Containerfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/container/Containerfile b/container/Containerfile index 07d68e6b5dfb..3f9cac33e99e 100644 --- a/container/Containerfile +++ b/container/Containerfile @@ -84,13 +84,18 @@ RUN dnf install -y --setopt=install_weak_deps=False epel-release jq # NFS-Ganesha repo RUN set -eux; \ - { \ + source /etc/ceph-distro.env; \ + if [[ "${DIST_PATH}" == rocky/* ]]; then \ + curl -fs -L "https://shaman.ceph.com/api/repos/nfs-ganesha/main/latest/${DIST_PATH}/repo?arch=$(arch)" -o /etc/yum.repos.d/ganesha.repo; \ + else \ + { \ printf '%s\n' '[ganesha]'; \ printf '%s\n' 'name=ganesha'; \ printf '%s\n' "baseurl=${GANESHA_REPO_BASEURL}"; \ printf '%s\n' 'gpgcheck=0'; \ printf '%s\n' 'enabled=1'; \ - } > /etc/yum.repos.d/ganesha.repo + } > /etc/yum.repos.d/ganesha.repo; \ + fi # ISCSI repo RUN set -eux && \ -- 2.47.3