Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "squid: bump to nfs-ganesha 6.0" #2244

Merged
merged 2 commits into from
Sep 27, 2024
Merged

Revert "squid: bump to nfs-ganesha 6.0" #2244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dbc05b
Revert "squid: bump to nfs-ganesha 6.0"
guits Sep 25, 2024
38232d5
Revert "squid: add gmonitoring package"
guits Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ceph-releases/ALL/centos-arm64/9/daemon-base/__DOCKERFILE_INSTALL__
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ yum install -y epel-release && \
yum install -y jq && \
bash -c ' \
if [ -n "__GANESHA_PACKAGES__" ]; then \
if [[ "${CEPH_VERSION}" =~ master|main|squid ]]; then \
if [[ "${CEPH_VERSION}" =~ master|main|reef|squid ]]; then \
ARCH=$(arch); if [[ "${ARCH}" == "aarch64" ]]; then ARCH="arm64"; fi ; \
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-6/" >> /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|reef ]]; then \
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-stream/storage/\$basearch/nfsganesha-5/" >> /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 "gpgcheck=0" >> /etc/yum.repos.d/ganesha.repo ; \
echo "enabled=1" >> /etc/yum.repos.d/ganesha.repo ; \
elif [[ "${CEPH_VERSION}" == pacific ]]; then \
Expand Down
8 changes: 1 addition & 7 deletions ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,7 @@ yum install -y epel-release && \
yum install -y jq && \
bash -c ' \
if [ -n "__GANESHA_PACKAGES__" ]; then \
if [[ "${CEPH_VERSION}" =~ master|main|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-6/" >> /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|reef ]]; then \
if [[ "${CEPH_VERSION}" =~ master|main|quincy|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 ; \
Expand Down
1 change: 0 additions & 1 deletion ceph-releases/quincy/__GANESHA_PACKAGES__
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ceph-releases/quincy/centos-arm64/__GANESHA_PACKAGES__
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../quincy/__GANESHA_PACKAGES__
../../../src/daemon-base/__GANESHA_PACKAGES__
1 change: 0 additions & 1 deletion ceph-releases/reef/__GANESHA_PACKAGES__
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ceph-releases/reef/centos-arm64/__GANESHA_PACKAGES__
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../reef/__GANESHA_PACKAGES__
../../../src/daemon-base/__GANESHA_PACKAGES__
1 change: 1 addition & 0 deletions ceph-releases/squid/centos/__GANESHA_PACKAGES__
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nfs-ganesha-5.5-1.el__ENV_[DISTRO_VERSION]__s nfs-ganesha-ceph-5.5-1.el__ENV_[DISTRO_VERSION]__s nfs-ganesha-rgw-5.5-1.el__ENV_[DISTRO_VERSION]__s nfs-ganesha-rados-grace-5.5-1.el__ENV_[DISTRO_VERSION]__s nfs-ganesha-rados-urls-5.5-1.el__ENV_[DISTRO_VERSION]__s sssd-client dbus-daemon rpcbind
2 changes: 1 addition & 1 deletion src/daemon-base/__GANESHA_PACKAGES__
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nfs-ganesha nfs-ganesha-ceph nfs-ganesha-rgw nfs-ganesha-rados-grace nfs-ganesha-rados-urls sssd-client dbus-daemon rpcbind gmonitoring
nfs-ganesha nfs-ganesha-ceph nfs-ganesha-rgw nfs-ganesha-rados-grace nfs-ganesha-rados-urls sssd-client dbus-daemon rpcbind
Loading