From 120041215c7962606347259046c7a0ee71241a34 Mon Sep 17 00:00:00 2001 From: ashrod98 Date: 2023年10月11日 18:26:54 +0000 Subject: [PATCH] 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 --- devstack/lib/cephadm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/devstack/lib/cephadm b/devstack/lib/cephadm index cd2cd2cc..d6d44f44 100755 --- a/devstack/lib/cephadm +++ b/devstack/lib/cephadm @@ -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"

AltStyle によって変換されたページ (->オリジナル) /