From f5ac80e332c2a057ee68d95983492bc7e1156b9a Mon Sep 17 00:00:00 2001 From: Dincer Celik Date: Fri, 28 Jun 2019 21:00:18 +0300 Subject: Fixes ceph-osd deploys with loop devices. Change-Id: I98405e3fb32cbec2d9863817a913ed71c5597e15 Closes-Bug: #1834678 --- docker/ceph/ceph-osd/extend_start.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/ceph/ceph-osd/extend_start.sh b/docker/ceph/ceph-osd/extend_start.sh index c6cd4535c..31c4a0ffb 100644 --- a/docker/ceph/ceph-osd/extend_start.sh +++ b/docker/ceph/ceph-osd/extend_start.sh @@ -39,7 +39,12 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then sgdisk --new=1:0:+100M --mbrtogpt -- "${OSD_BS_DEV}" sgdisk --largest-new=2 --mbrtogpt -- "${OSD_BS_DEV}" partprobe || true - sgdisk --zap-all -- "${OSD_BS_DEV}"2 + + if [[ "${OSD_BS_DEV}" =~ "/dev/loop" ]]; then + sgdisk --zap-all -- "${OSD_BS_DEV}"p2 + else + sgdisk --zap-all -- "${OSD_BS_DEV}"2 + fi fi if [ -n "${OSD_BS_WAL_DEV}" ] && [ "${OSD_BS_BLK_DEV}" != "${OSD_BS_WAL_DEV}" ] && [ -n "${OSD_BS_WAL_PARTNUM}" ]; then -- cgit v1.2.3