From fe1050a95a68a0c73e6ac826bc71c44ff8402d82 Mon Sep 17 00:00:00 2001
From: Anoop C S <anoopcs@samba.org>
Date: Tue, 16 Sep 2025 11:14:48 +0530
Subject: [PATCH 1/3] images/server: Use Storage SIG ceph tentacle for ceph20

Signed-off-by: Anoop C S <anoopcs@samba.org>
---
 images/server/install-packages.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/images/server/install-packages.sh b/images/server/install-packages.sh
index 35f8333..b99ec44 100755
--- a/images/server/install-packages.sh
+++ b/images/server/install-packages.sh
@@ -74,7 +74,6 @@ get_sig_samba_repo() {
     fi
 }
 
-# shellcheck disable=SC2120
 get_distro_ceph_repo() {
     if [[ "${OS_BASE}" = centos ]]; then
         if [[ -z $1 ]]; then
@@ -161,11 +160,7 @@ case "${install_packages_from}" in
     ;;
     ceph20)
         get_sig_samba_repo "4.22"
-        # Replace the following with 'get_distro_ceph_repo "tentacle"'
-        # once tentacle builds are out and remove the shellcheck waiver
-        # for get_distro_ceph_repo
-        CEPH_REPO_REF=tentacle
-        get_ceph_shaman_repo
+        get_distro_ceph_repo "tentacle"
         package_selection=${package_selection:-stable}
     ;;
     *)

From 280186ad807f8bbf7d9fd1d9d4d61c209676b1c5 Mon Sep 17 00:00:00 2001
From: Anoop C S <anoopcs@samba.org>
Date: Tue, 16 Sep 2025 11:15:38 +0530
Subject: [PATCH 2/3] images/server: Switch to Samba v4.23 for ceph20

Signed-off-by: Anoop C S <anoopcs@samba.org>
---
 images/server/install-packages.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/server/install-packages.sh b/images/server/install-packages.sh
index b99ec44..f325921 100755
--- a/images/server/install-packages.sh
+++ b/images/server/install-packages.sh
@@ -159,7 +159,7 @@ case "${install_packages_from}" in
         package_selection=${package_selection:-custom-devbuilds}
     ;;
     ceph20)
-        get_sig_samba_repo "4.22"
+        get_sig_samba_repo "4.23"
         get_distro_ceph_repo "tentacle"
         package_selection=${package_selection:-stable}
     ;;

From b02c885e1ff463b918f7831a19e2487e2d9df065 Mon Sep 17 00:00:00 2001
From: Anoop C S <anoopcs@samba.org>
Date: Tue, 16 Sep 2025 11:45:49 +0530
Subject: [PATCH 3/3] images/server: Generalize samba installation on CentOS

Signed-off-by: Anoop C S <anoopcs@samba.org>
---
 images/server/install-packages.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/images/server/install-packages.sh b/images/server/install-packages.sh
index f325921..209679c 100755
--- a/images/server/install-packages.sh
+++ b/images/server/install-packages.sh
@@ -198,12 +198,8 @@ case "${package_selection}-${OS_BASE}" in
     *-fedora|allvfs-*)
         samba_packages+=(samba-vfs-cephfs samba-vfs-glusterfs ctdb-ceph-mutex)
     ;;
-    *devbuilds-centos|forcedevbuilds-*|stable-*)
-	# Enable libcephfs proxy for dev builds
+    *-centos|forcedevbuilds-*)
         support_packages+=(libcephfs-proxy2)
-	# Fall through to next case
-    ;&
-    nightly-centos|default-centos)
         samba_packages+=(samba-vfs-cephfs samba-vfs-glusterfs ctdb-ceph-mutex)
         # these packages should be installed as deps. of sambacc extras
         # however, the sambacc builds do not enable the extras on centos atm.