Increase quotas and number of threads for tempest

Increase quotas for Cinder (Generic driver case) and Manila.
Increase number of threads for tempest run to simulate concurrency and
have test run in shorter time slot.

Change-Id: Ic7473c94eeb2b45533c028352b56e4027cd7eead
This commit is contained in:
vponomaryov 2014-12-20 13:22:33 +02:00
parent 15fcc9e6a4
commit 1bffbf0a7a
4 changed files with 17 additions and 3 deletions

View File

@ -31,7 +31,7 @@ fi
set +o errexit
cd $BASE/new/tempest
export TEMPEST_CONCURRENCY=6
export TEMPEST_CONCURRENCY=12
export MANILA_TESTS='tempest.cli.*manila*'
if [[ ! "$ZUUL_PROJECT" =~ python-manilaclient ]]; then
MANILA_TESTS+=' tempest.api.share*';

View File

@ -7,6 +7,7 @@ if is_service_enabled manila; then
elif [[ "$1" == "stack" && "$2" == "install" ]]; then
echo_summary "Installing Manila"
install_manila
set_cinder_quotas
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
echo_summary "Configuring Manila"
configure_manila

View File

@ -162,6 +162,19 @@ function set_config_opts {
fi
}
function set_cinder_quotas {
# Update Cinder configuration to make sure default quotas are enough
# for Manila using Generic driver with parallel testing.
if is_service_enabled cinder; then
if [[ ! "$CINDER_CONF" ]]; then
CINDER_CONF=/etc/cinder/cinder.conf
fi
iniset $CINDER_CONF DEFAULT quota_volumes 50
iniset $CINDER_CONF DEFAULT quota_snapshots 50
iniset $CINDER_CONF DEFAULT quota_gigabytes 1000
fi
}
# configure_manila - Set config files, create data dirs, etc
function configure_manila {
setup_develop $MANILA_DIR

View File

@ -32,10 +32,10 @@ LOG = logging.getLogger(__name__)
quota_opts = [
cfg.IntOpt('quota_shares',
default=10,
default=50,
help='Number of shares allowed per project.'),
cfg.IntOpt('quota_snapshots',
default=10,
default=50,
help='Number of share snapshots allowed per project.'),
cfg.IntOpt('quota_gigabytes',
default=1000,