Skip to content

Add ceph20 package source corresponding to ceph tentacle #209

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+26 −12
Draft

Add ceph20 package source corresponding to ceph tentacle #209

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
8e1abcc
images/server: Add 'ceph20' package source for ceph tentacle
anoopcs9 Jun 17, 2025
741cfb2
hack/build-image: Define 'ceph20' package source
anoopcs9 Jul 10, 2025
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
4 changes: 3 additions & 1 deletion hack/build-image
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,14 @@ DISTROS = [
DEFAULT = "default"
NIGHTLY = "nightly"
DEVBUILDS = "devbuilds"
PACKAGE_SOURCES = [DEFAULT, NIGHTLY, DEVBUILDS]
CEPH20 = "ceph20"
PACKAGE_SOURCES = [DEFAULT, NIGHTLY, DEVBUILDS, CEPH20]

PACKAGES_FROM = {
DEFAULT: "",
NIGHTLY: "samba-nightly",
DEVBUILDS: "devbuilds",
CEPH20: "ceph20",
}

# SOURCE_DIRS - image source paths
Expand Down
34 changes: 23 additions & 11 deletions images/server/install-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,25 @@ get_samba_nightly_repo() {

get_sig_samba_repo() {
if [[ "${OS_BASE}" = centos ]]; then
dnf install --setopt=install_weak_deps=False -y \
centos-release-samba
if [[ -z $1 ]]; then
dnf install --setopt=install_weak_deps=False -y \
centos-release-samba
else
dnf install --setopt=install_weak_deps=False -y \
centos-release-samba"${1//.}"
fi
fi
}

get_distro_ceph_repo() {
if [[ "${OS_BASE}" = centos ]]; then
dnf install --setopt=install_weak_deps=False -y \
centos-release-ceph
if [[ -z $1 ]]; then
dnf install --setopt=install_weak_deps=False -y \
centos-release-ceph
else
dnf install --setopt=install_weak_deps=False -y \
centos-release-ceph-"${1}"
fi
fi
}

Expand Down Expand Up @@ -105,6 +115,11 @@ case "${install_packages_from}" in
get_ceph_shaman_repo
package_selection=${package_selection:-custom-devbuilds}
;;
ceph20)
get_sig_samba_repo "4.22"
get_distro_ceph_repo "tentacle"
package_selection=${package_selection:-stable}
;;
*)
get_sig_samba_repo
get_distro_ceph_repo
Expand Down Expand Up @@ -138,16 +153,13 @@ samba_packages=(\
ctdb)
case "${package_selection}-${OS_BASE}" in
*-fedora|allvfs-*)
support_packages+=(libcephfs-proxy2)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you intend to add this dependency to the fedora build? It seems to be causing the existing fedora build to fail now?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I made the change for both CentOS and Fedora in the hope of libcephfs-proxy2 getting packaged and available with tentacle release.

samba_packages+=(samba-vfs-cephfs samba-vfs-glusterfs ctdb-ceph-mutex)
;;
*devbuilds-centos|forcedevbuilds-*)
# Enable libcephfs proxy for dev builds
support_packages+=(libcephfs-proxy2)
# Fall through to next case
;&
nightly-centos|default-centos)
*-centos|forcedevbuilds-*)
dnf_cmd+=(--enablerepo=epel)
samba_packages+=(samba-vfs-cephfs ctdb-ceph-mutex)
support_packages+=(libcephfs-proxy2)
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.
# Once this is fixed this line ought to be removed.
Expand Down
Loading