From d962d573ec37dba4d5d63ceb8e08d9e86b51d80b Mon Sep 17 00:00:00 2001 From: Jens Rosenboom Date: Thu, 1 Dec 2016 14:07:29 +0100 Subject: [PATCH] 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 --- devstack/lib/ceph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devstack/lib/ceph b/devstack/lib/ceph index 27ad69dd..4625ea99 100644 --- a/devstack/lib/ceph +++ b/devstack/lib/ceph @@ -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 # Ceph data. Set ``CEPH_LOOPBACK_DISK_SIZE`` to the disk size in # 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=\ ${CEPH_LOOPBACK_DISK_SIZE:-$CEPH_LOOPBACK_DISK_SIZE_DEFAULT}