diff options
| author | Zuul <zuul@review.opendev.org> | 2019-07-03 07:37:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-07-03 07:37:55 +0000 |
| commit | 02f3f09143e652526fac7d6aae9aab5b9a272505 (patch) | |
| tree | 6d529513b29b73504d57646c066c1ea95f3eee9a /docker | |
| parent | 111cd931f82c3af7eb26a1090a9776d45014aaa3 (diff) | |
| parent | f5ac80e332c2a057ee68d95983492bc7e1156b9a (diff) | |
| download | kolla-02f3f09143e652526fac7d6aae9aab5b9a272505.tar.gz kolla-02f3f09143e652526fac7d6aae9aab5b9a272505.zip | |
Merge "Fixes ceph-osd deploys with loop devices."
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceph/ceph-osd/extend_start.sh | 7 |
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 |