diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-28 10:26:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-28 10:26:38 +0000 |
| commit | 762b24cc1a29f6ba803ee2045d41f98d6adbed05 (patch) | |
| tree | 92840f60ba48880e7f7f60e8846dd30511fbe3cb /docker | |
| parent | 1b43c2b35259437cb0a57eada54a22fab4b3de76 (diff) | |
| parent | c62ddbfa977fbf27bbf1241bf20e9e1835212197 (diff) | |
| download | kolla-762b24cc1a29f6ba803ee2045d41f98d6adbed05.tar.gz kolla-762b24cc1a29f6ba803ee2045d41f98d6adbed05.zip | |
Merge "Remove quotes from subshell call in bash script"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/ceph/ceph-mon/start.sh | 2 | ||||
| -rwxr-xr-x | docker/ceph/ceph-osd/start.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docker/ceph/ceph-mon/start.sh b/docker/ceph/ceph-mon/start.sh index 3afaa3ad4..a8661d449 100755 --- a/docker/ceph/ceph-mon/start.sh +++ b/docker/ceph/ceph-mon/start.sh @@ -21,7 +21,7 @@ set_configs # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then # Lookup our fsid from the ceph.conf - FSID="$(awk '/^fsid/ {print $3; exit}' /etc/ceph/ceph.conf)" + FSID=$(awk '/^fsid/ {print $3; exit}' /etc/ceph/ceph.conf) # Generating initial keyrings and monmap ceph-authtool --create-keyring "${KEYRING_MON}" --gen-key -n mon. --cap mon 'allow *' diff --git a/docker/ceph/ceph-osd/start.sh b/docker/ceph/ceph-osd/start.sh index 84549ae8c..501d44bef 100755 --- a/docker/ceph/ceph-osd/start.sh +++ b/docker/ceph/ceph-osd/start.sh @@ -21,10 +21,10 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then partprobe || true # We look up the appropriate device path with partition. - OSD_PARTITION="$(ls ${OSD_DEV}* | egrep ${OSD_DEV}p?1)" + OSD_PARTITION=$(ls "${OSD_DEV}"* | egrep "${OSD_DEV}p?1") JOURNAL_PARTITION="${OSD_PARTITION%?}2" - OSD_ID="$(ceph osd create)" + OSD_ID=$(ceph osd create) OSD_DIR="/var/lib/ceph/osd/ceph-${OSD_ID}" mkdir -p "${OSD_DIR}" mkfs.xfs -f "${OSD_PARTITION}" @@ -47,7 +47,7 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then fi # We look up the appropriate journal since we cannot rely on symlinks -JOURNAL_PARTITION="$(ls ${OSD_DEV}* | egrep ${OSD_DEV}p?2)" +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" |