Merge "Add support for neutron-full and api jobs using pecan to gate_hook"

This commit is contained in:
Jenkins 2016-01-19 11:15:14 +00:00 committed by Gerrit Code Review
commit 893961c0d3
1 changed files with 12 additions and 1 deletions

View File

@ -22,7 +22,7 @@ then
sudo chown -R $STACK_USER:$STACK_USER $BASE sudo chown -R $STACK_USER:$STACK_USER $BASE
configure_host_for_func_testing configure_host_for_func_testing
elif [ "$VENV" == "api" ] elif [ "$VENV" == "api" -o "$VENV" == "api-pecan" -o "$VENV" == "full-pecan" ]
then then
cat > $DEVSTACK_PATH/local.conf <<EOF cat > $DEVSTACK_PATH/local.conf <<EOF
[[post-config|/etc/neutron/neutron_vpnaas.conf]] [[post-config|/etc/neutron/neutron_vpnaas.conf]]
@ -32,6 +32,17 @@ service_provider=VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.
EOF EOF
if [ "$VENV" == "api-pecan" -o "$VENV" == "full-pecan" ]
then
cat >> $DEVSTACK_PATH/local.conf <<EOF
[[post-config|/etc/neutron/neutron.conf]]
[default]
web_framework=pecan
EOF
fi
export DEVSTACK_LOCAL_CONFIG+=" export DEVSTACK_LOCAL_CONFIG+="
enable_plugin neutron-vpnaas git://git.openstack.org/openstack/neutron-vpnaas enable_plugin neutron-vpnaas git://git.openstack.org/openstack/neutron-vpnaas
enable_plugin neutron git://git.openstack.org/openstack/neutron enable_plugin neutron git://git.openstack.org/openstack/neutron