diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-21 19:05:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-21 19:05:13 +0000 |
| commit | bb12f82c70cec2c400793add4bf920035c5e1283 (patch) | |
| tree | 1bca572eecd789a0f7d5d3d202191ca4cba63be1 /docker/ceph | |
| parent | fb54a89bde8bd09ea417a9ab10218a8c51a99149 (diff) | |
| parent | af0d73ea384aad8bdd306fc2e1c0a29dfa5fb9e3 (diff) | |
| download | kolla-bb12f82c70cec2c400793add4bf920035c5e1283.tar.gz kolla-bb12f82c70cec2c400793add4bf920035c5e1283.zip | |
Merge "Rename ceph-mon bootstrap container to avoid conflict"
Diffstat (limited to 'docker/ceph')
| -rw-r--r-- | docker/ceph/ceph-mon/extend_start.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docker/ceph/ceph-mon/extend_start.sh b/docker/ceph/ceph-mon/extend_start.sh index 3b8246e37..fd17de511 100644 --- a/docker/ceph/ceph-mon/extend_start.sh +++ b/docker/ceph/ceph-mon/extend_start.sh @@ -21,8 +21,7 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then ceph-authtool "${KEYRING_MON}" --import-keyring "${KEYRING_RGW}" monmaptool --create --add "$(hostname)" "${MON_IP}" --fsid "${FSID}" "${MONMAP}" - echo "Sleeping until keys are fetched" - /bin/sleep infinity + exit 0 fi # This section runs on every mon that does not have a keyring already. |