diff options
| author | Zuul <zuul@review.opendev.org> | 2019-04-24 19:54:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-04-24 19:54:55 +0000 |
| commit | b4af6e23b482c98fcce894bb802ccab9d0158b91 (patch) | |
| tree | 23b8a4eae113a8339614724abbb6a3678a60df78 /docker | |
| parent | e0137e7df46b3917a86c6062668f7b717a9356ca (diff) | |
| parent | 8371ecb2acc5be214dcf9503c83a9ccb4081f151 (diff) | |
| download | kolla-b4af6e23b482c98fcce894bb802ccab9d0158b91.tar.gz kolla-b4af6e23b482c98fcce894bb802ccab9d0158b91.zip | |
Merge "Fix the problem that the crush map is changed" into stable/stein
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceph/ceph-osd/extend_start.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/docker/ceph/ceph-osd/extend_start.sh b/docker/ceph/ceph-osd/extend_start.sh index e73e4d95f..68c0a28d6 100644 --- a/docker/ceph/ceph-osd/extend_start.sh +++ b/docker/ceph/ceph-osd/extend_start.sh @@ -149,8 +149,12 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then # These commands only need to be run once per host but are safe to run # repeatedly. This can be improved later or if any problems arise. - ceph osd crush add-bucket "${HOSTNAME}${CEPH_ROOT_NAME:+-${CEPH_ROOT_NAME}}" host - ceph osd crush move "${HOSTNAME}${CEPH_ROOT_NAME:+-${CEPH_ROOT_NAME}}" root=${CEPH_ROOT_NAME:-default} + host_bucket_name="${HOSTNAME}${CEPH_ROOT_NAME:+-${CEPH_ROOT_NAME}}" + host_bucket_check=$(ceph osd tree | awk '/'"${host_bucket_name}"'/{print $0}' | wc -l) + if [[ "${host_bucket_check}" -eq 0 ]]; then + ceph osd crush add-bucket "${host_bucket_name}" host + ceph osd crush move "${host_bucket_name}" root=${CEPH_ROOT_NAME:-default} + fi # Adding osd to crush map ceph osd crush add "${OSD_ID}" "${OSD_INITIAL_WEIGHT}" host="${HOSTNAME}${CEPH_ROOT_NAME:+-${CEPH_ROOT_NAME}}" |