From 2dbc05bb7d7d4a6fe9798acb6d1908669a18539f Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 25 Sep 2024 16:03:31 +0000 Subject: [PATCH 1/2] Revert "squid: bump to nfs-ganesha 6.0" This reverts commit 535121edee6335a87e169cc410d8ee8a558e078b. Signed-off-by: Guillaume Abrioux --- .../ALL/centos-arm64/9/daemon-base/__DOCKERFILE_INSTALL__ | 8 ++++---- .../ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ | 8 +------- 2 files changed, 5 insertions(+), 11 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 ff89b9c80..51d29e1ff 100644 --- a/ceph-releases/ALL/centos-arm64/9/daemon-base/__DOCKERFILE_INSTALL__ +++ b/ceph-releases/ALL/centos-arm64/9/daemon-base/__DOCKERFILE_INSTALL__ @@ -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 \ diff --git a/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ b/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ index 391f16038..6c0945cd7 100644 --- a/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ +++ b/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ @@ -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 ; \ From 38232d54d2dc314db8f7b2792f8f59fe27292460 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 25 Sep 2024 16:03:44 +0000 Subject: [PATCH 2/2] Revert "squid: add gmonitoring package" This reverts commit 2842c0673fcfc3f91adf68e0d45ab11674c92540. Signed-off-by: Guillaume Abrioux --- ceph-releases/quincy/__GANESHA_PACKAGES__ | 1 - ceph-releases/quincy/centos-arm64/__GANESHA_PACKAGES__ | 2 +- ceph-releases/reef/__GANESHA_PACKAGES__ | 1 - ceph-releases/reef/centos-arm64/__GANESHA_PACKAGES__ | 2 +- ceph-releases/squid/centos/__GANESHA_PACKAGES__ | 1 + src/daemon-base/__GANESHA_PACKAGES__ | 2 +- 6 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 ceph-releases/quincy/__GANESHA_PACKAGES__ delete mode 100644 ceph-releases/reef/__GANESHA_PACKAGES__ create mode 100644 ceph-releases/squid/centos/__GANESHA_PACKAGES__ diff --git a/ceph-releases/quincy/__GANESHA_PACKAGES__ b/ceph-releases/quincy/__GANESHA_PACKAGES__ deleted file mode 100644 index c6b59e7d5..000000000 --- a/ceph-releases/quincy/__GANESHA_PACKAGES__ +++ /dev/null @@ -1 +0,0 @@ -nfs-ganesha nfs-ganesha-ceph nfs-ganesha-rgw nfs-ganesha-rados-grace nfs-ganesha-rados-urls sssd-client dbus-daemon rpcbind diff --git a/ceph-releases/quincy/centos-arm64/__GANESHA_PACKAGES__ b/ceph-releases/quincy/centos-arm64/__GANESHA_PACKAGES__ index 801cd151f..e49c75779 120000 --- a/ceph-releases/quincy/centos-arm64/__GANESHA_PACKAGES__ +++ b/ceph-releases/quincy/centos-arm64/__GANESHA_PACKAGES__ @@ -1 +1 @@ -../../quincy/__GANESHA_PACKAGES__ \ No newline at end of file +../../../src/daemon-base/__GANESHA_PACKAGES__ \ No newline at end of file diff --git a/ceph-releases/reef/__GANESHA_PACKAGES__ b/ceph-releases/reef/__GANESHA_PACKAGES__ deleted file mode 100644 index c6b59e7d5..000000000 --- a/ceph-releases/reef/__GANESHA_PACKAGES__ +++ /dev/null @@ -1 +0,0 @@ -nfs-ganesha nfs-ganesha-ceph nfs-ganesha-rgw nfs-ganesha-rados-grace nfs-ganesha-rados-urls sssd-client dbus-daemon rpcbind diff --git a/ceph-releases/reef/centos-arm64/__GANESHA_PACKAGES__ b/ceph-releases/reef/centos-arm64/__GANESHA_PACKAGES__ index 9ab7552de..e49c75779 120000 --- a/ceph-releases/reef/centos-arm64/__GANESHA_PACKAGES__ +++ b/ceph-releases/reef/centos-arm64/__GANESHA_PACKAGES__ @@ -1 +1 @@ -../../reef/__GANESHA_PACKAGES__ \ No newline at end of file +../../../src/daemon-base/__GANESHA_PACKAGES__ \ No newline at end of file diff --git a/ceph-releases/squid/centos/__GANESHA_PACKAGES__ b/ceph-releases/squid/centos/__GANESHA_PACKAGES__ new file mode 100644 index 000000000..e16becb75 --- /dev/null +++ b/ceph-releases/squid/centos/__GANESHA_PACKAGES__ @@ -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 diff --git a/src/daemon-base/__GANESHA_PACKAGES__ b/src/daemon-base/__GANESHA_PACKAGES__ index 0ff960302..c6b59e7d5 100644 --- a/src/daemon-base/__GANESHA_PACKAGES__ +++ b/src/daemon-base/__GANESHA_PACKAGES__ @@ -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