aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorDincer Celik <hello@dincercelik.com>2019-06-28 21:00:18 +0300
committerDincer Celik <hello@dincercelik.com>2019-06-28 21:04:45 +0300
commitf5ac80e332c2a057ee68d95983492bc7e1156b9a (patch)
tree22edd45ed15f8f09f7ba3c6b57de06d4701ed3eb /docker
parent5ecb9107ea286bd0c1a45d4d95d064c764d33296 (diff)
downloadkolla-f5ac80e332c2a057ee68d95983492bc7e1156b9a.tar.gz
kolla-f5ac80e332c2a057ee68d95983492bc7e1156b9a.zip
Fixes ceph-osd deploys with loop devices.
Change-Id: I98405e3fb32cbec2d9863817a913ed71c5597e15 Closes-Bug: #1834678
Diffstat (limited to 'docker')
-rw-r--r--docker/ceph/ceph-osd/extend_start.sh7
1 files changed, 6 insertions, 1 deletions
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