Skip to content

Commit a5cb393

Browse files
anoopcs9phlogistonjohn
authored andcommitted
images/server: Add 'ceph20' package source for ceph tentacle
With tentacle we have libcephfs-proxy automatically available from standard repositories. Signed-off-by: Anoop C S <[email protected]>
1 parent 53799e0 commit a5cb393

File tree

1 file changed

+25
-5
lines changed

1 file changed

+25
-5
lines changed

images/server/install-packages.sh

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,26 @@ get_samba_nightly_repo() {
6464

6565
get_sig_samba_repo() {
6666
if [[ "${OS_BASE}" = centos ]]; then
67-
dnf install --setopt=install_weak_deps=False -y \
68-
centos-release-samba
67+
if [[ -z $1 ]]; then
68+
dnf install --setopt=install_weak_deps=False -y \
69+
centos-release-samba
70+
else
71+
dnf install --setopt=install_weak_deps=False -y \
72+
centos-release-samba"${1//.}"
73+
fi
6974
fi
7075
}
7176

77+
# shellcheck disable=SC2120
7278
get_distro_ceph_repo() {
7379
if [[ "${OS_BASE}" = centos ]]; then
74-
dnf install --setopt=install_weak_deps=False -y \
75-
centos-release-ceph
80+
if [[ -z $1 ]]; then
81+
dnf install --setopt=install_weak_deps=False -y \
82+
centos-release-ceph
83+
else
84+
dnf install --setopt=install_weak_deps=False -y \
85+
centos-release-ceph-"${1}"
86+
fi
7687
fi
7788
}
7889

@@ -148,6 +159,15 @@ case "${install_packages_from}" in
148159
get_ceph_shaman_repo
149160
package_selection=${package_selection:-custom-devbuilds}
150161
;;
162+
ceph20)
163+
get_sig_samba_repo "4.22"
164+
# Replace the following with 'get_distro_ceph_repo "tentacle"'
165+
# once tentacle builds are out and remove the shellcheck waiver
166+
# for get_distro_ceph_repo
167+
CEPH_REPO_REF=tentacle
168+
get_ceph_shaman_repo
169+
package_selection=${package_selection:-stable}
170+
;;
151171
*)
152172
get_sig_samba_repo
153173
get_distro_ceph_repo
@@ -183,7 +203,7 @@ case "${package_selection}-${OS_BASE}" in
183203
*-fedora|allvfs-*)
184204
samba_packages+=(samba-vfs-cephfs samba-vfs-glusterfs ctdb-ceph-mutex)
185205
;;
186-
*devbuilds-centos|forcedevbuilds-*)
206+
*devbuilds-centos|forcedevbuilds-*|stable-*)
187207
# Enable libcephfs proxy for dev builds
188208
support_packages+=(libcephfs-proxy2)
189209
# Fall through to next case

0 commit comments

Comments
 (0)