Fix disk size default settings

In [1] the default value for CEPH_LOOPBACK_DISK_SIZE_DEFAULT was changed
to be VOLUME_BACKING_FILE_SIZE instead of a fixed value. This will break
in some cases as there is no fallback defined for
VOLUME_BACKING_FILE_SIZE in devstack/lib/ceph.

[1] https://review.openstack.org/403988

Change-Id: I117e36db442c8ef8c469e4149629e8a27d22da22
This commit is contained in:
Jens Rosenboom 2016-12-01 14:07:29 +01:00
parent 9293ac03ab
commit d962d573ec
1 changed files with 1 additions and 1 deletions

View File

@ -44,7 +44,7 @@ CEPH_CONF_DIR=${CEPH_CONF_DIR:-/etc/ceph}
# DevStack will create a loop-back disk formatted as XFS to store the # DevStack will create a loop-back disk formatted as XFS to store the
# Ceph data. Set ``CEPH_LOOPBACK_DISK_SIZE`` to the disk size in # Ceph data. Set ``CEPH_LOOPBACK_DISK_SIZE`` to the disk size in
# kilobytes. # kilobytes.
# Default is 10 gigabytes. VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-8GB}
CEPH_LOOPBACK_DISK_SIZE_DEFAULT=${CEPH_LOOPBACK_DISK_SIZE_DEFAULT:-$VOLUME_BACKING_FILE_SIZE} CEPH_LOOPBACK_DISK_SIZE_DEFAULT=${CEPH_LOOPBACK_DISK_SIZE_DEFAULT:-$VOLUME_BACKING_FILE_SIZE}
CEPH_LOOPBACK_DISK_SIZE=\ CEPH_LOOPBACK_DISK_SIZE=\
${CEPH_LOOPBACK_DISK_SIZE:-$CEPH_LOOPBACK_DISK_SIZE_DEFAULT} ${CEPH_LOOPBACK_DISK_SIZE:-$CEPH_LOOPBACK_DISK_SIZE_DEFAULT}