From 26b7a3f8192abbd20563bd8280f17744b64f79e8 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Tue, 10 Mar 2020 18:40:07 -0600 Subject: [PATCH] qa/workunits/cephadm/test_cephadm.sh: move osd test to ceph-volume instead of via the orchestrator Signed-off-by: Michael Fritch --- qa/workunits/cephadm/test_cephadm.sh | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh index b6c6cad306cfb..ba67dce7060d6 100755 --- a/qa/workunits/cephadm/test_cephadm.sh +++ b/qa/workunits/cephadm/test_cephadm.sh @@ -273,11 +273,33 @@ loop_dev=$($SUDO losetup -f) $SUDO vgremove -f $OSD_VG_NAME || true $SUDO losetup $loop_dev $TMPDIR/$OSD_IMAGE_NAME $SUDO pvcreate $loop_dev && $SUDO vgcreate $OSD_VG_NAME $loop_dev + +# osd boostrap keyring +$CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \ + ceph auth get client.bootstrap-osd > $TMPDIR/keyring.bootstrap.osd + 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 --fsid $FSID --config $CONFIG --keyring $KEYRING -- \ - ceph orch daemon add osd \ - $(hostname):/dev/$OSD_VG_NAME/$OSD_LV_NAME.$id + device_name=/dev/$OSD_VG_NAME/$OSD_LV_NAME.$id + + # 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 + + # osd id and osd fsid + $CEPHADM ceph-volume --config $CONFIG --keyring $TMPDIR/keyring.bootstrap.osd -- \ + 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(.)') + + # deploy the osd + $CEPHADM deploy --name osd.$osd_id \ + --fsid $FSID \ + --keyring $TMPDIR/keyring.bootstrap.osd \ + --config $CONFIG \ + --osd-fsid $osd_fsid done # add node-exporter -- 2.39.5