Skip to content
This repository was archived by the owner on Dec 19, 2024. It is now read-only.

Commit 7f973c0

Browse files
committed
quincy: Use nfs-ganesha 4
This should unbreak the 17.2.8 build. There is a more elegant solution to this overall issue here (#2169) but a lot has changed since then and paths, versions, etc. need to be verified. Signed-off-by: David Galloway <[email protected]>
1 parent ffa9970 commit 7f973c0

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

ceph-releases/ALL/centos-arm64/9/daemon-base/__DOCKERFILE_INSTALL__

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bash -c ' \
1212
elif [[ "${CEPH_VERSION}" == quincy ]]; then \
1313
echo "[ganesha]" > /etc/yum.repos.d/ganesha.repo ; \
1414
echo "name=ganesha" >> /etc/yum.repos.d/ganesha.repo ; \
15-
echo "baseurl=https://buildlogs.centos.org/centos/\$releasever/storage/\$basearch/nfsganesha-4/" >> /etc/yum.repos.d/ganesha.repo ; \
15+
echo "baseurl=https://mirror.stream.centos.org/SIGs/\$releasever-stream/storage/\$basearch/nfsganesha-4/" >> /etc/yum.repos.d/ganesha.repo ; \
1616
echo "gpgcheck=0" >> /etc/yum.repos.d/ganesha.repo ; \
1717
echo "enabled=1" >> /etc/yum.repos.d/ganesha.repo ; \
1818
elif [[ "${CEPH_VERSION}" == pacific ]]; then \

ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,18 @@ yum install -y epel-release && \
22
yum install -y jq && \
33
bash -c ' \
44
if [ -n "__GANESHA_PACKAGES__" ]; then \
5-
if [[ "${CEPH_VERSION}" =~ master|main|quincy|reef|squid ]]; then \
5+
if [[ "${CEPH_VERSION}" =~ master|main|reef|squid ]]; then \
66
echo "[ganesha]" > /etc/yum.repos.d/ganesha.repo ; \
77
echo "name=ganesha" >> /etc/yum.repos.d/ganesha.repo ; \
88
echo "baseurl=https://buildlogs.centos.org/centos/\$releasever-stream/storage/\$basearch/nfsganesha-5/" >> /etc/yum.repos.d/ganesha.repo ; \
99
echo "gpgcheck=0" >> /etc/yum.repos.d/ganesha.repo ; \
1010
echo "enabled=1" >> /etc/yum.repos.d/ganesha.repo ; \
11+
elif [[ "${{CEPH_VERSION}}" == quincy ]]; then \
12+
echo "[ganesha]" > /etc/yum.repos.d/ganesha.repo ; \
13+
echo "name=ganesha" >> /etc/yum.repos.d/ganesha.repo ; \
14+
echo "baseurl=https://mirror.stream.centos.org/SIGs/\$releasever-stream/storage/\$basearch/nfsganesha-4/" >> /etc/yum.repos.d/ganesha.repo ; \
15+
echo "gpgcheck=0" >> /etc/yum.repos.d/ganesha.repo ; \
16+
echo "enabled=1" >> /etc/yum.repos.d/ganesha.repo ; \
1117
elif [[ "${CEPH_VERSION}" == pacific ]]; then \
1218
echo "[ganesha]" > /etc/yum.repos.d/ganesha.repo ; \
1319
echo "name=ganesha" >> /etc/yum.repos.d/ganesha.repo ; \

0 commit comments

Comments
 (0)