Revert bad rebase

Code Issues Proposed changes

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

committed by Ashley Rodriguez

parent b663a9fb83

commit 120041215c

1 changed files with 4 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

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"

Revert bad rebase

5 devstack/lib/cephadm Unescape Escape View File

5
devstack/lib/cephadm

View File