diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-09 17:12:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-09 17:12:21 +0000 |
| commit | a82e7b1239982a89761a10b726220b1f43b61211 (patch) | |
| tree | e289d2ffcca4671ff88f21e896792ca18b9f53c3 /docker | |
| parent | 5868a13da8a87a1f629455e27c460a1b87741f9e (diff) | |
| parent | 7b6fbdf41d75801ba2a9243b42f985dcf6f03e62 (diff) | |
| download | kolla-a82e7b1239982a89761a10b726220b1f43b61211.tar.gz kolla-a82e7b1239982a89761a10b726220b1f43b61211.zip | |
Merge "Remove storage_hostname"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceph/ceph-osd/extend_start.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/ceph/ceph-osd/extend_start.sh b/docker/ceph/ceph-osd/extend_start.sh index 202aad186..7c1e479c0 100644 --- a/docker/ceph/ceph-osd/extend_start.sh +++ b/docker/ceph/ceph-osd/extend_start.sh @@ -44,11 +44,11 @@ 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} + 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} # Adding osd to crush map - ceph osd crush add "${OSD_ID}" "${OSD_INITIAL_WEIGHT}" host="$(hostname)${CEPH_ROOT_NAME:+-${CEPH_ROOT_NAME}}" + ceph osd crush add "${OSD_ID}" "${OSD_INITIAL_WEIGHT}" host="${HOSTNAME}${CEPH_ROOT_NAME:+-${CEPH_ROOT_NAME}}" exit 0 fi |