openstack
/
devstack-gate
Code Issues Proposed changes

Add q-vpn back to base services but exclude for liberty runs 

Commit c59dfacef8 removed the q-vpn
service from being enabled in all neutron runs which is OK for liberty
since that project has it's own devstack plugin and job configs for
master, but it breaks stable/kilo.

So add the q-vpn service back in for kilo.

Related-Bug: #1473475

Change-Id: I69ea5b194fec520e1aa31eb0554cf83c447a5e18
This commit is contained in:
Matt Riedemann 2015-08-13 08:25:32 -07:00
parent 9a550bc406
commit 626faaee06
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features.yaml
View File

@ -90,6 +90,8 @@ features:
base:
services: [quantum, q-svc, q-agt, q-dhcp, q-l3, q-meta, q-lbaas, q-fwaas, q-metering]
rm-services: [n-net]
kilo:
services: [q-vpn]
swift:
base:

8
test-features.sh
View File

@ -20,6 +20,8 @@ TEMPEST_FULL_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizo
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_NEUTRON_KILO="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,q-vpn"
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"
@ -65,6 +67,11 @@ function test_neutron_master {
assert_list_equal $TEMPEST_NEUTRON_MASTER $results
}
function test_neutron_kilo {
local results=$(DEVSTACK_GATE_NEUTRON=1 DEVSTACK_GATE_TEMPEST=1 ./test-matrix.py -b stable/kilo)
assert_list_equal $TEMPEST_NEUTRON_KILO $results
}
function test_heat_slow_master {
local results=$(DEVSTACK_GATE_TEMPEST_HEAT_SLOW=1 DEVSTACK_GATE_NEUTRON=1 DEVSTACK_GATE_TEMPEST=1 ./test-matrix.py)
assert_list_equal $TEMPEST_HEAT_SLOW_MASTER $results
@ -88,6 +95,7 @@ function test_grenade_icehouse_master {
test_full_master
test_full_feature_ec
test_neutron_master
test_neutron_kilo
test_heat_slow_master
test_grenade_new_master
test_grenade_juno_master