From: Michael Fritch <mfritch@suse.com>
Date: Mon, 13 Jan 2020 19:03:07 +0000 (-0700)
Subject: test_cephadm: use container shell for ceph cmds
X-Git-Tag: v15.1.0~180^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c047f627ceb765e7033a91f48b0a6501f0cd57c6;p=ceph.git

test_cephadm: use container shell for ceph cmds

allow `ceph auth get-or-create` to be used without
the need for a pre-built ceph binary.

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

diff --git a/test_cephadm.sh b/test_cephadm.sh
index b4fc8e333178..ba344f1e06d0 100755
--- a/test_cephadm.sh
+++ b/test_cephadm.sh
@@ -56,10 +56,11 @@ $CEPHADM $CEPHADM_ARGS \
 rm c.mon
 
 # mgr.b
-bin/ceph -c c -k k auth get-or-create mgr.y \
-    mon 'allow profile mgr' \
-    osd 'allow *' \
-    mds 'allow *' > k-mgr.y
+$CEPHADM $CEPHADM_ARGS shell --fsid $fsid --config c --keyring k -- \
+    ceph auth get-or-create mgr.y \
+        mon 'allow profile mgr' \
+        osd 'allow *' \
+        mds 'allow *' > k-mgr.y
 $CEPHADM $CEPHADM_ARGS \
     --image $image \
     deploy --name mgr.y \
@@ -69,11 +70,12 @@ $CEPHADM $CEPHADM_ARGS \
 
 # mds.{k,j}
 for id in k j; do
-    bin/ceph -c c -k k auth get-or-create mds.$id \
-        mon 'allow profile mds' \
-        mgr 'allow profile mds' \
-        osd 'allow *' \
-        mds 'allow *' > k-mds.$id
+    $CEPHADM $CEPHADM_ARGS shell --fsid $fsid --config c --keyring k -- \
+        ceph auth get-or-create mds.$id \
+            mon 'allow profile mds' \
+            mgr 'allow profile mds' \
+            osd 'allow *' \
+            mds 'allow *' > k-mds.$id
     $CEPHADM $CEPHADM_ARGS \
         --image $image \
         deploy --name mds.$id \
@@ -94,4 +96,4 @@ for id in `seq 0 $((--OSD_TO_CREATE))`; do
                 $(hostname):/dev/$OSD_VG_NAME/$OSD_LV_NAME.$id
 done
 
-bin/ceph -c c -k k -s
+$CEPHADM $CEPHADM_ARGS shell --fsid $fsid --config c --keyring k -- ceph -s