summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorJens Rosenboom <j.rosenboom@x-ion.de>2016-12-01 14:07:29 +0100
committerJens Rosenboom <j.rosenboom@x-ion.de>2016-12-01 14:09:41 +0100
commitd962d573ec37dba4d5d63ceb8e08d9e86b51d80b (patch)
treeb60ea1a4e7da29bc90858de035480e82b28bcc4f /devstack
parent9293ac03aba0cabd7148c6a9940ac12c57bef0f1 (diff)
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
Notes
Notes (review): Code-Review+1: Matt Riedemann <mriedem@us.ibm.com> Code-Review+2: Eric Harney <eharney@redhat.com> Workflow+1: Jon Bernard <jobernar@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 16 Jan 2017 14:44:16 +0000 Reviewed-on: https://review.openstack.org/405363 Project: openstack/devstack-plugin-ceph Branch: refs/heads/master
Diffstat (limited to 'devstack')
-rw-r--r--devstack/lib/ceph2
1 files changed, 1 insertions, 1 deletions
diff --git a/devstack/lib/ceph b/devstack/lib/ceph
index 27ad69d..4625ea9 100644
--- a/devstack/lib/ceph
+++ b/devstack/lib/ceph
@@ -44,7 +44,7 @@ CEPH_CONF_DIR=${CEPH_CONF_DIR:-/etc/ceph}
44# DevStack will create a loop-back disk formatted as XFS to store the 44# DevStack will create a loop-back disk formatted as XFS to store the
45# Ceph data. Set ``CEPH_LOOPBACK_DISK_SIZE`` to the disk size in 45# Ceph data. Set ``CEPH_LOOPBACK_DISK_SIZE`` to the disk size in
46# kilobytes. 46# kilobytes.
47# Default is 10 gigabytes. 47VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-8GB}
48CEPH_LOOPBACK_DISK_SIZE_DEFAULT=${CEPH_LOOPBACK_DISK_SIZE_DEFAULT:-$VOLUME_BACKING_FILE_SIZE} 48CEPH_LOOPBACK_DISK_SIZE_DEFAULT=${CEPH_LOOPBACK_DISK_SIZE_DEFAULT:-$VOLUME_BACKING_FILE_SIZE}
49CEPH_LOOPBACK_DISK_SIZE=\ 49CEPH_LOOPBACK_DISK_SIZE=\
50${CEPH_LOOPBACK_DISK_SIZE:-$CEPH_LOOPBACK_DISK_SIZE_DEFAULT} 50${CEPH_LOOPBACK_DISK_SIZE:-$CEPH_LOOPBACK_DISK_SIZE_DEFAULT}