]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "Use GANESHA_REPO_BASEURL for NFS-Ganesha on all distros" 68985/head
authorDavid Galloway <david.galloway@ibm.com>
Wed, 20 May 2026 20:38:52 +0000 (16:38 -0400)
committerDavid Galloway <david.galloway@ibm.com>
Wed, 20 May 2026 20:52:34 +0000 (16:52 -0400)
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 <david.galloway@ibm.com>
container/Containerfile

index 07d68e6b5dfb2b97cd22d4e90c517c7e7ddf77a0..3f9cac33e99e8cfcee6b8ade53e60aad4f4d1d50 100644 (file)
@@ -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 && \