openstack/neutron
Code Issues Proposed changes

Merge "Remove VPN installation plumbing"

Browse Source
This commit is contained in:
Jenkins 2016-02-14 08:56:29 +00:00 committed by Gerrit Code Review
commit 9fc367187d
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
neutron/tests/contrib/gate_hook.sh
View File

@ -40,14 +40,6 @@ then
elif [ "$VENV" == "api" -o "$VENV" == "api-pecan" -o "$VENV" == "full-pecan" ]
then
cat > $DEVSTACK_PATH/local.conf <<EOF
[[post-config|/etc/neutron/neutron_vpnaas.conf]]
[service_providers]
service_provider=VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
EOF
if [ "$VENV" == "api-pecan" -o "$VENV" == "full-pecan" ]
then
cat >> $DEVSTACK_PATH/local.conf <<EOF
@ -60,7 +52,6 @@ EOF
fi
export DEVSTACK_LOCAL_CONFIG+="
enable_plugin neutron-vpnaas git://git.openstack.org/openstack/neutron-vpnaas
enable_plugin neutron git://git.openstack.org/openstack/neutron
enable_service q-qos
enable_service q-bgp