Skip to content
Merged
Changes from all commits
Commits
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
15 changes: 3 additions & 12 deletions images/server/install-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -160,12 +159,8 @@ case "${install_packages_from}" in
package_selection=${package_selection:-custom-devbuilds}
;;
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_sig_samba_repo "4.23"
get_distro_ceph_repo "tentacle"
package_selection=${package_selection:-stable}
;;
*)
Expand Down Expand Up @@ -203,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.
Expand Down