From 3848ec26bf04b94838404169a57a739f43c2098b Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Tue, 7 Apr 2020 15:27:35 -0600 Subject: [PATCH] qa/workunits/cephadm/test_cephadm.sh: add fsid to ceph-volume cmds needed when testing with a multi-cluster setup Signed-off-by: Michael Fritch --- qa/workunits/cephadm/test_cephadm.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh index 1be330d80e6..c3be38eb6b1 100755 --- a/qa/workunits/cephadm/test_cephadm.sh +++ b/qa/workunits/cephadm/test_cephadm.sh @@ -288,16 +288,17 @@ done for id in `seq 0 $((--OSD_TO_CREATE))`; do device_name=/dev/$OSD_VG_NAME/$OSD_LV_NAME.$id + CEPH_VOLUME="$CEPHADM ceph-volume \ + --fsid $FSID \ + --config $CONFIG \ + --keyring $TMPDIR/keyring.bootstrap.osd --" # prepare the osd - $CEPHADM ceph-volume --config $CONFIG --keyring $TMPDIR/keyring.bootstrap.osd -- \ - lvm prepare --bluestore --data $device_name --no-systemd - $CEPHADM ceph-volume --config $CONFIG --keyring $TMPDIR/keyring.bootstrap.osd -- \ - lvm batch --no-auto $device_name --yes --no-systemd + $CEPH_VOLUME lvm prepare --bluestore --data $device_name --no-systemd + $CEPH_VOLUME lvm batch --no-auto $device_name --yes --no-systemd # osd id and osd fsid - $CEPHADM ceph-volume --config $CONFIG --keyring $TMPDIR/keyring.bootstrap.osd -- \ - lvm list --format json $device_name > $TMPDIR/osd.map + $CEPH_VOLUME lvm list --format json $device_name > $TMPDIR/osd.map osd_id=$($SUDO cat $TMPDIR/osd.map | jq -cr '.. | ."ceph.osd_id"? | select(.)') osd_fsid=$($SUDO cat $TMPDIR/osd.map | jq -cr '.. | ."ceph.osd_fsid"? | select(.)')