diff options
| author | Zuul <zuul@review.opendev.org> | 2019-05-22 11:22:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-05-22 11:22:30 +0000 |
| commit | 14f7501441924a8e533fc9b75ce16719de3de945 (patch) | |
| tree | 33ae6cfb76f7ce066d4f00c84920baac4e8d9072 /docker/ceph | |
| parent | bbec9c7ba6457e4e8df6f535c1915f941336caf3 (diff) | |
| parent | 285814353af29395932e15d78c6a154796978a21 (diff) | |
| download | kolla-14f7501441924a8e533fc9b75ce16719de3de945.tar.gz kolla-14f7501441924a8e533fc9b75ce16719de3de945.zip | |
Merge "Fix multiple mon deployment failures"
Diffstat (limited to 'docker/ceph')
| -rw-r--r-- | docker/ceph/ceph-mon/extend_start.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/docker/ceph/ceph-mon/extend_start.sh b/docker/ceph/ceph-mon/extend_start.sh index 8ec53e8b7..4c3e91b31 100644 --- a/docker/ceph/ceph-mon/extend_start.sh +++ b/docker/ceph/ceph-mon/extend_start.sh @@ -39,6 +39,16 @@ if [[ ! -e "${MON_DIR}/keyring" ]]; then ceph-authtool --create-keyring "${KEYRING_TMP}" --import-keyring "${KEYRING_ADMIN}" ceph-authtool "${KEYRING_TMP}" --import-keyring "${KEYRING_MON}" mkdir -p "${MON_DIR}" - ceph-mon --mkfs -i "${HOSTNAME}" --monmap "${MONMAP}" --keyring "${KEYRING_TMP}" + + mon_stat=$(ceph mon stat --connect-timeout 1 || true) + mon_check=$(echo $mon_stat | awk '/mons/{print $0}' | wc -l) + if [[ ${mon_check} -eq 0 ]]; then + ceph-mon --mkfs -i "${HOSTNAME}" --keyring "${KEYRING_TMP}" + else + MONMAP_TMP="/tmp/ceph.${HOSTNAME}.monmap" + ceph mon getmap -o "${MONMAP_TMP}" + ceph-mon --mkfs -i "${HOSTNAME}" --monmap "${MONMAP_TMP}" --keyring "${KEYRING_TMP}" + rm "${MONMAP_TMP}" + fi rm "${KEYRING_TMP}" fi |