From: Sage Weil <sage@redhat.com>
Date: Thu, 12 Dec 2019 13:36:23 +0000 (-0600)
Subject: qa/workunits/cephadm/test_cephadm.sh: need --fsid always
X-Git-Tag: v15.1.0~529^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=feaa79f90260d59dadb16f4bd4be91f1d7944421;p=ceph.git

qa/workunits/cephadm/test_cephadm.sh: need --fsid always

Otherwise the test breaks if there are other cluster(s) on the host (like
there normally are in my dev environment).

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh
index 29cf4b278057a..ad7f799d4575a 100755
--- a/qa/workunits/cephadm/test_cephadm.sh
+++ b/qa/workunits/cephadm/test_cephadm.sh
@@ -96,7 +96,6 @@ $SUDO $CEPHADM_BIN --image $IMAGE_MASTER version | grep 'ceph version'
 which docker && ( $CEPHADM --docker version | grep 'ceph version' )
 
 ## test shell before bootstrap, when crash dir isn't (yet) present on this host
-$CEPHADM shell -- ceph -v | grep 'ceph version'
 $CEPHADM shell --fsid $FSID -- ceph -v | grep 'ceph version'
 
 ## bootstrap
@@ -188,7 +187,7 @@ $SUDO losetup $loop_dev $TMPDIR/$OSD_IMAGE_NAME
 $SUDO pvcreate $loop_dev && $SUDO vgcreate $OSD_VG_NAME $loop_dev
 for id in `seq 0 $((--OSD_TO_CREATE))`; do
     $SUDO lvcreate -l $((100/$OSD_TO_CREATE))%VG -n $OSD_LV_NAME.$id $OSD_VG_NAME
-    $CEPHADM shell --config $CONFIG --keyring $KEYRING -- \
+    $CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \
             ceph orchestrator osd create \
                 $(hostname):/dev/$OSD_VG_NAME/$OSD_LV_NAME.$id
 done
@@ -229,7 +228,7 @@ $CEPHADM unit --fsid $FSID --name mon.a -- enable
 $CEPHADM unit --fsid $FSID --name mon.a -- is-enabled
 
 ## shell
-$CEPHADM shell -- true
+$CEPHADM shell --fsid $FSID -- true
 $CEPHADM shell --fsid $FSID -- test -d /var/log/ceph
 
 ## enter