diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-28 11:26:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-28 11:26:26 +0000 |
| commit | e69571eeb3729907be2ea6acb80904c4790a6916 (patch) | |
| tree | 28e0044ab7bf86a1ce63279e0002e7f993680e0f /docker/ceph/ceph-osd | |
| parent | 6c1e4e02073e2e64b387fd62104d91ed7d1aeffd (diff) | |
| parent | 83d195249ebb7250f1531e865ee962944997e9bd (diff) | |
| download | kolla-e69571eeb3729907be2ea6acb80904c4790a6916.tar.gz kolla-e69571eeb3729907be2ea6acb80904c4790a6916.zip | |
Merge "Convert ceph to json"
Diffstat (limited to 'docker/ceph/ceph-osd')
| -rw-r--r-- | docker/ceph/ceph-osd/config-external.sh | 20 | ||||
| -rwxr-xr-x | docker/ceph/ceph-osd/start.sh | 7 |
2 files changed, 2 insertions, 25 deletions
diff --git a/docker/ceph/ceph-osd/config-external.sh b/docker/ceph/ceph-osd/config-external.sh deleted file mode 100644 index 8928f91cb..000000000 --- a/docker/ceph/ceph-osd/config-external.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/ceph-osd/ceph.conf" -TARGET="/etc/ceph/ceph.conf" -OWNER="ceph" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - 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 9a27d60cc..4b26c426b 100755 --- a/docker/ceph/ceph-osd/start.sh +++ b/docker/ceph/ceph-osd/start.sh @@ -7,11 +7,9 @@ source /opt/kolla/kolla-common.sh # 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 - 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 --new=2:1M:5G --change-name=2:KOLLA_CEPH_JOURNAL --typecode=2:45B0969E-9B03-4F30-B4C6-B4B80CEFF106 --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 @@ -45,7 +43,6 @@ 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" +ARGS="-i ${OSD_ID} --osd-journal ${JOURNAL_PARTITION} -k ${OSD_DIR}/keyring" exec $CMD $ARGS |