From: Michael Fritch <mfritch@suse.com>
Date: Thu, 18 Nov 2021 23:33:29 +0000 (-0700)
Subject: cstart.sh: compile cephadm
X-Git-Tag: v18.0.0~7^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4bc88b9e5fcf3cebbdb322bb0c38fcd26390f816;p=ceph.git

cstart.sh: compile cephadm

update cstart/ckill scripts to use the compiled cephadm binary

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/ckill.sh b/src/ckill.sh
index 32251556f192..593aad471d47 100755
--- a/src/ckill.sh
+++ b/src/ckill.sh
@@ -1,5 +1,13 @@
 #!/bin/bash -e
 
+if [ -e CMakeCache.txt ]; then
+    [ -z "$CEPH_BIN" ] && CEPH_BIN=bin
+fi
+
+if [ -z "$CEPHADM" ]; then
+    CEPHADM="${CEPH_BIN}/cephadm"
+fi
+
 # fsid
 if [ -e fsid ] ; then
     fsid=`cat fsid`
@@ -9,5 +17,5 @@ else
 fi
 echo "fsid $fsid"
 
-sudo ../src/cephadm/cephadm rm-cluster --force --fsid $fsid
+sudo $CEPHADM rm-cluster --force --fsid $fsid
 
diff --git a/src/cstart.sh b/src/cstart.sh
index ca76c789ca3b..1b958df536f5 100755
--- a/src/cstart.sh
+++ b/src/cstart.sh
@@ -1,5 +1,13 @@
 #!/bin/bash -e
 
+if [ -e CMakeCache.txt ]; then
+    [ -z "$CEPH_BIN" ] && CEPH_BIN=bin
+fi
+
+if [ -z "$CEPHADM" ]; then
+    CEPHADM="${CEPH_BIN}/cephadm"
+fi
+
 image_base="quay.io/ceph-ci/ceph"
 
 if which podman 2>&1 > /dev/null; then
@@ -55,8 +63,8 @@ if ! sudo $runtime image inspect $image_base:$shortid 1>/dev/null 2>/dev/null; t
     sudo ../src/script/cpatch -t $image_base:$shortid
 fi
 
-sudo ../src/cephadm/cephadm rm-cluster --force --fsid $fsid
-sudo ../src/cephadm/cephadm --image ${image_base}:${shortid} bootstrap \
+sudo $CEPHADM rm-cluster --force --fsid $fsid
+sudo $CEPHADM --image ${image_base}:${shortid} bootstrap \
      --skip-pull \
      --fsid $fsid \
      --mon-addrv "[v2:$ip:$port]" \
@@ -69,7 +77,7 @@ sudo chmod 755 ceph.client.admin.keyring
 echo 'keyring = ceph.client.admin.keyring' >> ceph.conf
 
 # don't use repo digests; this implicitly does a pull and we don't want that
-bin/ceph config set mgr mgr/cephadm/use_repo_digest false
+${CEPH_BIN}/ceph config set mgr mgr/cephadm/use_repo_digest false
 
 echo
 echo "sudo ../src/script/cpatch -t $image_base:$shortid"