Merge "Clean up cinder volume group rather than remove it"
diff --git a/functions b/functions
index 294c380..e1795ae 100644
--- a/functions
+++ b/functions
@@ -73,7 +73,6 @@
set +o xtrace
local evar=$1; shift
if ! is_set $evar || [ $exitcode != 0 ]; then
- set +o xtrace
echo $@
exit -1
fi
@@ -650,10 +649,8 @@
if [[ "$os_PACKAGE" = "deb" ]]; then
dpkg -l "$@" > /dev/null
- return $?
elif [[ "$os_PACKAGE" = "rpm" ]]; then
rpm --quiet -q "$@"
- return $?
else
exit_distro_not_supported "finding if a package is installed"
fi
@@ -664,10 +661,7 @@
# is_set env-var
function is_set() {
local var=\$"$1"
- if eval "[ -z \"$var\" ]"; then
- return 1
- fi
- return 0
+ eval "[ -n \"$var\" ]" # For ex.: sh -c "[ -n \"$var\" ]" would be better, but several exercises depends on this
}
@@ -973,11 +967,9 @@
if [[ -z "$DATABASE_BACKENDS" ]]; then
# The backends haven't initialized yet, just save the selection for now
DATABASE_TYPE=$1
- return
+ else
+ use_exclusive_service DATABASE_BACKENDS DATABASE_TYPE $1
fi
- use_exclusive_service DATABASE_BACKENDS DATABASE_TYPE $1 && return 0
- ret=$?
- return $ret
}
# Toggle enable/disable_service for services that must run exclusive of each other
@@ -1141,7 +1133,6 @@
# Qpid was introduced to Ubuntu in precise, disallow it on oneiric; it is
# not in openSUSE either right now.
( ! ([[ "$DISTRO" = "oneiric" ]] || is_suse) )
- return $?
}
# Restore xtrace
diff --git a/lib/tempest b/lib/tempest
index d08daeb..b408b11 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -188,6 +188,12 @@
iniset $TEMPEST_CONF compute resize_available False
iniset $TEMPEST_CONF compute change_password_available False
iniset $TEMPEST_CONF compute compute_log_level ERROR
+ # Note(nati) current tempest don't create network for each tenant
+ # so reuse same tenant for now
+ if is_service_enabled quantum; then
+ TEMPEST_ALLOW_TENANT_ISOLATION=${TEMPEST_ALLOW_TENANT_ISOLATION:-False}
+ fi
+ iniset $TEMPEST_CONF compute allow_tenant_isolation ${TEMPEST_ALLOW_TENANT_ISOLATION:-True}
#Skip until #1074039 is fixed
iniset $TEMPEST_CONF compute run_ssh False
iniset $TEMPEST_CONF compute ssh_user ${DEFAULT_INSTANCE_USER:-$OS_USERNAME}