Merge "gate_hook: accept dsvm-scenario-[ovs|linuxbridge] venv name"

This commit is contained in:
Jenkins 2017-03-07 16:19:07 +00:00 committed by Gerrit Code Review
commit 4118ea2e7b

View File

@ -84,7 +84,8 @@ case $VENV in
cd $DEVSTACK_PATH && sudo -H -u $GATE_STACK_USER ./stack.sh
;;
"api"|"api-pecan"|"full-ovsfw"|"full-pecan"|"dsvm-scenario")
# TODO(ihrachys): remove dsvm-scenario from the list when it's no longer used in project-config
"api"|"api-pecan"|"full-ovsfw"|"full-pecan"|"dsvm-scenario"|"dsvm-scenario-ovs"|"dsvm-scenario-linuxbridge")
load_rc_hook api_${FLAVOR}_extensions
load_conf_hook quotas
load_rc_hook dns
@ -99,7 +100,7 @@ case $VENV in
if [[ "$VENV" =~ "pecan" ]]; then
load_conf_hook pecan
fi
if [[ "$VENV" =~ "ovsfw" ]]; then
if [[ "$VENV" =~ "ovs" ]]; then
load_conf_hook ovsfw
fi