From 19f8725d6035cb4de937331a3b1ea10a554647f4 Mon Sep 17 00:00:00 2001
From: ashrod98 <ashrod98@gmail.com>
Date: Wed, 11 Oct 2023 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/files/rpms/devstack-plugin-ceph | 1 +
 devstack/lib/cephadm                     | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/devstack/files/rpms/devstack-plugin-ceph b/devstack/files/rpms/devstack-plugin-ceph
index 1b806da..730f8d6 100644
--- a/devstack/files/rpms/devstack-plugin-ceph
+++ b/devstack/files/rpms/devstack-plugin-ceph
@@ -3,3 +3,4 @@ dbus-tools
 podman
 jq
 ceph-common
+catatonit
diff --git a/devstack/lib/cephadm b/devstack/lib/cephadm
index cd2cd2c..d6d44f4 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"