From c59dfacef8c211b7e114e634ca17f225bde6c3e0 Mon Sep 17 00:00:00 2001 From: Paul Michali Date: Sat, 1 Aug 2015 13:18:17 -0400 Subject: [PATCH] Remove q-vpn service for DSVM tests There is a DevStack plugin for the neutron-vpnaas repo now, that enables the q-vpn service. The repo has DSVM based (functional) tests that use the new plugin and exercise the service. We now want to remove q-vpn setup from the DevStack repo, and to rely on the new plugin. To do that, however, we need to make sure that DSVM tests (other than those in the neutron-vpnaas repo) do not enable q-vpn, as it will not be set up during stacking (and q-l3 will not be properly set up if q-vpn is enabled). This patch, along with I3a4d7ecb25668eb499677d05bdb68b919592e53d are attempting to remove q-vpn from the list of enabled services. Change-Id: Idd5524ed0b602408be5a53830981a8ab974b390c --- features.yaml | 2 +- test-features.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/features.yaml b/features.yaml index 430d973c..b15083d7 100644 --- a/features.yaml +++ b/features.yaml @@ -88,7 +88,7 @@ features: neutron: base: - services: [quantum, q-svc, q-agt, q-dhcp, q-l3, q-meta, q-lbaas, q-vpn, q-fwaas, q-metering] + services: [quantum, q-svc, q-agt, q-dhcp, q-l3, q-meta, q-lbaas, q-fwaas, q-metering] rm-services: [n-net] swift: diff --git a/test-features.sh b/test-features.sh index 146840e9..2fce73b2 100755 --- a/test-features.sh +++ b/test-features.sh @@ -18,9 +18,9 @@ ERRORS=0 TEMPEST_FULL_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,tempest,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,n-net" -TEMPEST_NEUTRON_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,tempest,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-lbaas,q-vpn,q-fwaas,q-metering" +TEMPEST_NEUTRON_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,tempest,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-lbaas,q-fwaas,q-metering" -TEMPEST_HEAT_SLOW_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,tempest,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-lbaas,q-vpn,q-fwaas,q-metering" +TEMPEST_HEAT_SLOW_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,tempest,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-lbaas,q-fwaas,q-metering" GRENADE_NEW_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,tempest,n-net,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification"