From: Jan Fajerski <jfajerski@suse.com>
Date: Tue, 24 Mar 2020 13:53:26 +0000 (+0100)
Subject: qa/workunits/cephadm: create lvs before calling cephadm
X-Git-Tag: v16.1.0~2815^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F34145%2Fhead;p=ceph.git

qa/workunits/cephadm: create lvs before calling cephadm

Fixes: https://tracker.ceph.com/issues/44682

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
---

diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh
index af09b2505568..1be330d80e6b 100755
--- a/qa/workunits/cephadm/test_cephadm.sh
+++ b/qa/workunits/cephadm/test_cephadm.sh
@@ -281,8 +281,12 @@ $SUDO pvcreate $loop_dev && $SUDO vgcreate $OSD_VG_NAME $loop_dev
 $CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \
       ceph auth get client.bootstrap-osd > $TMPDIR/keyring.bootstrap.osd
 
+# create lvs first so ceph-volume doesn't overlap with lv creation
 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
+done
+
+for id in `seq 0 $((--OSD_TO_CREATE))`; do
     device_name=/dev/$OSD_VG_NAME/$OSD_LV_NAME.$id
 
     # prepare the osd