summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSamYaple <sam@yaple.net>2016-03-09 04:12:26 +0000
committerSam Yaple <sam@yaple.net>2016-03-09 12:08:15 +0000
commit7b6fbdf41d75801ba2a9243b42f985dcf6f03e62 (patch)
treef89fac8842530933bf0db32ba9c7495c00f0a2da /docker
parent3b65e4993076d7000c57b55aaa26cc11173c2238 (diff)
downloadkolla-7b6fbdf41d75801ba2a9243b42f985dcf6f03e62.tar.gz
kolla-7b6fbdf41d75801ba2a9243b42f985dcf6f03e62.zip
Remove storage_hostname
This was an attempt to get storage_interface to work properly but that work will not be completed and functional this cycle. There are design topics that need to be discussed about it that were brought to light by the RAX gate failing for it. TrivialFix Change-Id: I65579f9e0e0dcf3fa51c0ea031ff474145457c40
Diffstat (limited to 'docker')
-rw-r--r--docker/ceph/ceph-osd/extend_start.sh6
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