Revert "Enable q-vpn service"

This reverts commit abebbd61eb.

From the discussion in bug #1230407, the neutron deadlocks may be
a persistent latent issue with driving large amounts of rpc traffic
in neutron. The reason this became an issue this week may be related
to turning on q-vpn in the gate, as that generates even more traffic.

If we revert this change, and things go back to "normal" failure
rates, then this gives us more evidence in that direction.

Change-Id: Ia62dc1cd7efce3aaab5b8825e26082d42f629f88
Related-Bug: 1230407
This commit is contained in:
Sean Dague
2013-09-28 08:47:43 -04:00
parent f1a093b13c
commit 71baa81691

View File

@@ -68,7 +68,7 @@ function setup_localrc() {
else # master
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,s-proxy,s-account,s-container,s-object,cinder,c-api,c-vol,c-sch,c-bak,n-cond,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api
if [ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]; then
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-lbaas,q-vpn
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-lbaas
echo "Q_USE_DEBUG_COMMAND=True" >>localrc
echo "NETWORK_GATEWAY=10.1.0.1" >>localrc
else