diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-03 00:23:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-03 00:23:26 +0000 |
| commit | d66e425397310bfbc433afce85e2e520b872b0a2 (patch) | |
| tree | d1fa2c8b992580eae681a1ef19409ce43ee0df07 /docker | |
| parent | 8f5955307ce1fe31857cc4001620c177c54f7360 (diff) | |
| parent | b27880aa77481db69a4594657a832cfd6ba8a2f4 (diff) | |
| download | kolla-d66e425397310bfbc433afce85e2e520b872b0a2.tar.gz kolla-d66e425397310bfbc433afce85e2e520b872b0a2.zip | |
Merge "Automate setting up a cache tier"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceph/ceph-osd/extend_start.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/docker/ceph/ceph-osd/extend_start.sh b/docker/ceph/ceph-osd/extend_start.sh index a63b97b3c..38a2a4234 100644 --- a/docker/ceph/ceph-osd/extend_start.sh +++ b/docker/ceph/ceph-osd/extend_start.sh @@ -26,13 +26,17 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then ceph auth add "osd.${OSD_ID}" osd 'allow *' mon 'allow profile osd' -i "${OSD_DIR}/keyring" umount "${OSD_PARTITION}" + if [[ "${!CEPH_CACHE[@]}" ]]; then + CEPH_ROOT_NAME=cache + fi + # 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)" host - ceph osd crush move "$(hostname)" root=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 osd crush add "${OSD_ID}" "${OSD_INITIAL_WEIGHT}" host="$(hostname)${CEPH_ROOT_NAME:+-${CEPH_ROOT_NAME}}" exit 0 fi |