openstack
/
devstack-plugin-ceph
Code Issues Proposed changes

Revert bad rebase 

Reverting a bad rebase to fix cephadm binary source
Also adds catatonit to rpms file to fix CI issues

Change-Id: Ie1b1dc0ef2508eae38ae7954fb0bb62653780644
This commit is contained in:
ashrod98 2023-10-11 18:26:54 +00:00
parent b663a9fb83
commit 19f8725d60
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/files/rpms/devstack-plugin-ceph
View File

@ -3,3 +3,4 @@ dbus-tools
podman
jq
ceph-common
catatonit

5
devstack/lib/cephadm
View File

@ -130,7 +130,10 @@ function install_deps {
# Pre-install ceph: get cephadm binary
function get_cephadm {
curl -O https://raw.githubusercontent.com/ceph/ceph/"$CEPH_RELEASE"/src/cephadm/cephadm
# NOTE(gouthamr): cephadm binary here is a python executable, and the
# $os_PACKAGE ("rpm") or $os_release (el9) doesn't really matter. There is
# no ubuntu/debian equivalent being published by the ceph community.
curl -O https://download.ceph.com/rpm-${CEPH_RELEASE}/el9/noarch/cephadm
$SUDO mv cephadm $TARGET_BIN
$SUDO chmod +x $TARGET_BIN/cephadm
echo "[GET CEPHADM] cephadm is now available"