Create backing disk using $VOLUME_BACKING_FILE_SIZE

The backing disk currently created is 8GB. devstack-gate
sets that to 24GB when running Tempest. We're seeing ceph
job failures due to NoValidHost in the cinder scheduler
because 8GB isn't enough capacity for Tempest runs. So this
change uses the same backing disk size for the ceph jobs as
we get in the default devstack setup, which uses LVM.

Depends-On: I71be308c8373e9ac429b901c374100c6b3c1e59d

Change-Id: I788eefa6c1d427bf51d2d3d40be4abe0336443e7
Closes-Bug: #1645530
This commit is contained in:
Matt Riedemann 2016-11-28 21:52:42 -05:00
parent 1382baf491
commit 9293ac03ab
2 changed files with 6 additions and 3 deletions

View File

@ -44,8 +44,8 @@ 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 1 gigabyte.
CEPH_LOOPBACK_DISK_SIZE_DEFAULT=8G
# Default is 10 gigabytes.
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}

View File

@ -12,7 +12,10 @@ CEPH_PLUGIN_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
# anyways.
TEMPEST_STORAGE_PROTOCOL=ceph
CEPH_LOOPBACK_DISK_SIZE=8G
# VOLUME_BACKING_FILE_SIZE should be sourced from devstack/stackrc but define
# a default here if not set already.
VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-8GB}
CEPH_LOOPBACK_DISK_SIZE=${CEPH_LOOPBACK_DISK_SIZE:-$VOLUME_BACKING_FILE_SIZE}
# Source plugin's lib/ceph
source $CEPH_PLUGIN_DIR/lib/ceph