summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-07-05 10:31:30 +0000
committerGerrit Code Review <review@openstack.org>2019-07-05 10:31:30 +0000
commit7134bc893b9b5918f3c1b7362eb0ed647c7364c8 (patch)
tree88551d4c467a70492cb1e8123f298dad869cb864 /docker
parentac66f586981b5333448545403242c2a5ebc90371 (diff)
parente930fb35ac603a148eb8fabd8684052d9c63e5f6 (diff)
downloadkolla-7134bc893b9b5918f3c1b7362eb0ed647c7364c8.tar.gz
kolla-7134bc893b9b5918f3c1b7362eb0ed647c7364c8.zip
Merge "Fixes ceph-osd deploys with loop devices." into stable/stein
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