openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Fix for ceph-osd regression"

Browse Source
This commit is contained in:
Zuul 2019-01-13 04:00:11 +00:00 committed by Gerrit Code Review
commit defeed8952
1 changed files with 1 additions and 2 deletions

3
ceph-osd/templates/bin/osd/_block.sh.tpl

@ -83,8 +83,8 @@ if [ "${OSD_BLUESTORE:-0}" -ne 1 ]; then
fi
if [ "x${JOURNAL_TYPE}" == "xdirectory" ]; then
OSD_JOURNAL="${OSD_JOURNAL}/journal.${OSD_ID}"
touch ${OSD_JOURNAL}
wait_for_file "${OSD_JOURNAL}"
chown ceph. "${OSD_JOURNAL}"
else
if [ ! -b "${OSD_JOURNAL}" ]; then
echo "ERROR: Unable to find journal device ${OSD_JOURNAL}"
@ -110,7 +110,6 @@ if [ "${OSD_BLUESTORE:-0}" -ne 1 ]; then
fi
if [ "x${JOURNAL_TYPE}" == "xdirectory" ]; then
touch ${OSD_JOURNAL}
chown -R ceph. /var/lib/ceph/journal
ceph-osd \
--cluster ceph \