gate_hook: Add support for neutron-full with the ovs firewall

Conflicts:
      neutron/tests/contrib/gate_hook.sh

Change-Id: I5502b2ed2eaf9105b73924856d4031fb99bc7b2c
(cherry picked from commit f142ab2e3b)
This commit is contained in:
IWAMOTO Toshihiro 2016-11-18 16:04:11 +09:00 committed by Ihar Hrachyshka
parent 92689470e1
commit 80ac267f5f
2 changed files with 8 additions and 1 deletions

View File

@ -81,7 +81,7 @@ case $VENV in
;;
# TODO(ihrachys): remove dsvm-scenario from the list when it's no longer used in project-config
"api"|"api-pecan"|"full-pecan"|"dsvm-scenario"|"dsvm-scenario-ovs"|"dsvm-scenario-linuxbridge")
"api"|"api-pecan"|"full-ovsfw"|"full-pecan"|"dsvm-scenario"|"dsvm-scenario-ovs"|"dsvm-scenario-linuxbridge")
load_rc_hook api_extensions
# NOTE(ihrachys): note the order of hook post-* sections is significant: [quotas] hook should
# go before other hooks modifying [DEFAULT]. See LP#1583214 for details.
@ -96,6 +96,9 @@ case $VENV in
if [[ "$VENV" =~ "pecan" ]]; then
load_conf_hook pecan
fi
if [[ "$VENV" =~ "ovsfw" ]]; then
load_conf_hook ovsfw
fi
export DEVSTACK_LOCALCONF=$(cat $LOCAL_CONF)
$BASE/new/devstack-gate/devstack-vm-gate.sh

View File

@ -0,0 +1,4 @@
[[post-config|/$Q_PLUGIN_CONF_FILE]]
[securitygroup]
firewall_driver = openvswitch