From 71baa816918d8ed29e1891edb3b511e3d9532280 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Sat, 28 Sep 2013 08:47:43 -0400 Subject: [PATCH] Revert "Enable q-vpn service" This reverts commit abebbd61eb4758ca5cbab35f3494e7f0262e5bf9. 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 --- devstack-vm-gate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index 0da955d8..ad57c500 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -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