Switch rally job from q-* to neutron-* service names

When at least one service named as q-* is present in ENABLED_SERVICES,
then devstack utilizes lib/neutron-legacy to configure services
regardless of how other services are deployed (e.g. with lib/neutron).
This breaks deployment using lib/neutron.

Switching to new names doesn't change anything substantial because
devstack plugin equally handles both variants. It allows to use new
devstack neutron library though.

Change-Id: Id0d35523651131766a70e78bf130205c1c63acd5
(cherry picked from commit 661247a617)
This commit is contained in:
Ihar Hrachyshka 2018-01-09 12:12:48 -08:00
parent c82c0f7919
commit b9302f5561
2 changed files with 2 additions and 2 deletions

View File

@ -66,7 +66,7 @@
ENABLED_SERVICES+=cinder,c-api,c-vol,c-sch,c-bak,
ENABLED_SERVICES+=g-api,g-reg,
ENABLED_SERVICES+=n-api,n-crt,n-cpu,n-sch,n-cond,
ENABLED_SERVICES+=q-qos,
ENABLED_SERVICES+=neutron-qos,
if [ $DEVSTACK_GATE_SWIFT -eq 1 ];
then

View File

@ -1 +1 @@
enable_service q-trunk
enable_service neutron-trunk