openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove quotes from subshell call in bash script"

Browse Source
This commit is contained in:
Jenkins 2015-09-28 10:26:38 +00:00 committed by Gerrit Code Review
commit 762b24cc1a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/ceph/ceph-mon/start.sh
View File

@ -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 *'

6
docker/ceph/ceph-osd/start.sh
View File

@ -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"