diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-25 11:14:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-25 11:14:56 +0000 |
| commit | 0f297ed0ee9e9a2eedf8c846e200321fd0070072 (patch) | |
| tree | 8537924992ecbc1b27b216a60474e6d722f1a555 /docker/ceph/ceph-osd | |
| parent | 32f263b01d73f12779ec0e9653d3caa4a78706d6 (diff) | |
| parent | c86e66c9dc3595199b4b88a526e2c204c12364c8 (diff) | |
| download | kolla-0f297ed0ee9e9a2eedf8c846e200321fd0070072.tar.gz kolla-0f297ed0ee9e9a2eedf8c846e200321fd0070072.zip | |
Merge "Ceph Ansible support"
Diffstat (limited to 'docker/ceph/ceph-osd')
| -rw-r--r-- | docker/ceph/ceph-osd/config-external.sh | 10 | ||||
| -rwxr-xr-x[-rw-r--r--] | docker/ceph/ceph-osd/start.sh | 42 |
2 files changed, 41 insertions, 11 deletions
diff --git a/docker/ceph/ceph-osd/config-external.sh b/docker/ceph/ceph-osd/config-external.sh index 8e17487ed..8928f91cb 100644 --- a/docker/ceph/ceph-osd/config-external.sh +++ b/docker/ceph/ceph-osd/config-external.sh @@ -8,3 +8,13 @@ if [[ -f "$SOURCE" ]]; then chown ${OWNER}: $TARGET chmod 0644 $TARGET fi + +SOURCE="/opt/kolla/ceph-osd/ceph.client.admin.keyring" +TARGET="/etc/ceph/ceph.client.admin.keyring" +OWNER="ceph" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0600 $TARGET +fi diff --git a/docker/ceph/ceph-osd/start.sh b/docker/ceph/ceph-osd/start.sh index cf9114a62..84549ae8c 100644..100755 --- a/docker/ceph/ceph-osd/start.sh +++ b/docker/ceph/ceph-osd/start.sh @@ -1,9 +1,7 @@ #!/bin/bash +set -o xtrace set -o errexit -CMD="/usr/bin/ceph-osd" -ARGS="-f -d -i ${OSD_ID} --osd-journal ${OSD_DIR}/journal -k ${OSD_DIR}/keyring" - # Loading common functions. source /opt/kolla/kolla-common.sh @@ -13,23 +11,45 @@ set_configs # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - # Creating a new label for the disk - parted "${OSD_DEV}" -s -- mklabel gpt + JOURNAL_PARTUUID=$(uuidgen) + + # Formating disk for ceph + sgdisk --zap-all -- "${OSD_DEV}" + sgdisk --new=2:1M:5G --change-name=2:KOLLA_CEPH_JOURNAL --typecode=2:45B0969E-9B03-4F30-B4C6-B4B80CEFF106 --partition-guid=2:${JOURNAL_PARTUUID} --mbrtogpt -- "${OSD_DEV}" + sgdisk --largest-new=1 --change-name=1:KOLLA_CEPH_DATA --typecode=1:4FBD7E29-9D25-41B8-AFD0-062C0CEFF05D -- "${OSD_DEV}" + # This command may throw errors that we can safely ignore + partprobe || true + + # We look up the appropriate device path with partition. + OSD_PARTITION="$(ls ${OSD_DEV}* | egrep ${OSD_DEV}p?1)" + JOURNAL_PARTITION="${OSD_PARTITION%?}2" - # Preparing the OSD for use with Ceph - ceph-disk prepare "${OSD_DEV}" OSD_ID="$(ceph osd create)" OSD_DIR="/var/lib/ceph/osd/ceph-${OSD_ID}" mkdir -p "${OSD_DIR}" - mount "${OSD_DEV}1" "${OSD_DIR}" - ceph-osd -i "${OSD_ID}" --mkfs --mkkey - ceph auth add "osd.${OSD_ID}" osd 'allow *' mon 'allow proflie osd' -i "${OSD_DIR}/keyring" + mkfs.xfs -f "${OSD_PARTITION}" + mount "${OSD_PARTITION}" "${OSD_DIR}" - # Adding osd to crush map + # This will through an error about no key existing. That is normal. It then + # creates the key in the next step. + ceph-osd -i "${OSD_ID}" --mkfs --osd-journal="${JOURNAL_PARTITION}" --mkkey + ceph auth add "osd.${OSD_ID}" osd 'allow *' mon 'allow profile osd' -i "${OSD_DIR}/keyring" + umount "${OSD_PARTITION}" + + # 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 + + # Adding osd to crush map ceph osd crush add "${OSD_ID}" "${OSD_INITIAL_WEIGHT}" host="$(hostname)" exit 0 fi +# We look up the appropriate journal since we cannot rely on symlinks +JOURNAL_PARTITION="$(ls ${OSD_DEV}* | egrep ${OSD_DEV}p?2)" +OSD_DIR="/var/lib/ceph/osd/ceph-${OSD_ID}" +CMD="/usr/bin/ceph-osd" +ARGS="-f -d -i ${OSD_ID} --osd-journal ${JOURNAL_PARTITION} -k ${OSD_DIR}/keyring" + exec $CMD $ARGS |
