openstack/devstack
Code Issues Proposed changes

Merge "Update multiple backend configuration in tempest script"

Browse Source
This commit is contained in:
Jenkins 2014-10-23 11:50:08 +00:00 committed by Gerrit Code Review
commit 26c9d02b31
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/tempest
View File

@ -28,6 +28,7 @@
# - ``DEFAULT_INSTANCE_TYPE`` # - ``DEFAULT_INSTANCE_TYPE``
# - ``DEFAULT_INSTANCE_USER`` # - ``DEFAULT_INSTANCE_USER``
# - ``CINDER_MULTI_LVM_BACKEND`` # - ``CINDER_MULTI_LVM_BACKEND``
# - ``CINDER_ENABLED_BACKENDS``
# #
# ``stack.sh`` calls the entry points in this order: # ``stack.sh`` calls the entry points in this order:
# #
@ -364,11 +365,17 @@ function configure_tempest {
if ! is_service_enabled c-bak; then if ! is_service_enabled c-bak; then
iniset $TEMPEST_CONFIG volume-feature-enabled backup False iniset $TEMPEST_CONFIG volume-feature-enabled backup False
fi fi
CINDER_MULTI_LVM_BACKEND=$(trueorfalse False $CINDER_MULTI_LVM_BACKEND)
if [ $CINDER_MULTI_LVM_BACKEND == "True" ]; then # Using CINDER_ENABLED_BACKENDS
if [[ -n "$CINDER_ENABLED_BACKENDS" ]] && [[ $CINDER_ENABLED_BACKENDS =~ .*,.* ]]; then
iniset $TEMPEST_CONFIG volume-feature-enabled multi_backend "True" iniset $TEMPEST_CONFIG volume-feature-enabled multi_backend "True"
iniset $TEMPEST_CONFIG volume backend1_name "LVM_iSCSI" local i=1
iniset $TEMPEST_CONFIG volume backend2_name "LVM_iSCSI_2" local be
for be in ${CINDER_ENABLED_BACKENDS//,/ }; do
local be_name=${be##*:}
iniset $TEMPEST_CONFIG volume "backend${i}_name" "$be_name"
i=$(( i + 1 ))
done
fi fi
if [ $TEMPEST_VOLUME_DRIVER != "default" -o \ if [ $TEMPEST_VOLUME_DRIVER != "default" -o \