Enabling Cinder multinode testing

Cinder team is planning to start multinode testing in Newton cycle. We
want to be able to test volume migration/retype and partial grenade.

This commit enables c-vol and c-bak on the subnode in regular multinode
setups (this should work as I4d2960d92f388ac689dfa6b436dc8bfc1e129fbf is
merged now). Also a new features.yaml elements are introduced that would
disable c-vol and c-bak on primary node. This will be required for
multinode grenade jobs that will test compatibility of master c-api and
c-sch with stable c-vol and c-bak.

Co-Authored-By: Karthik Prabhu Vinod <karthik.prabhu.vinod@intel.com>

Change-Id: I4532bdcfa845cf0a405f68371c61559b0a70f9c1
This commit is contained in:
Michał Dulko 2016-06-09 13:55:52 +02:00
parent 8aa9194ed9
commit 4f3bc0ef76
2 changed files with 9 additions and 2 deletions

View File

@ -214,9 +214,8 @@ function setup_localrc {
local original_enabled_services=$MY_ENABLED_SERVICES
# TODO(afazekas): Move to the feature grid
# TODO(afazekas): add c-vol
if [[ $role = sub ]]; then
MY_ENABLED_SERVICES="n-cpu,ceilometer-acompute,dstat"
MY_ENABLED_SERVICES="n-cpu,ceilometer-acompute,dstat,c-vol,c-bak"
if [[ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]]; then
MY_ENABLED_SERVICES+=",q-agt"
if [[ "$DEVSTACK_GATE_NEUTRON_DVR" -eq "1" ]]; then

View File

@ -47,6 +47,8 @@ config:
features: [heat]
tlsproxy:
features: [tlsproxy]
cinder_mn_grenade:
features: [cinder-mn-grenade]
branches:
# The value of ""default" is the name of the "trunk" branch
@ -110,6 +112,12 @@ features:
base:
services: [cinder, c-api, c-vol, c-sch, c-bak]
# This will be used to disable c-vol on primary node when running multinode grenade
# job that will test compatibility of new c-api, c-sch (primary) and old c-vol and c-bak (sub).
cinder-mn-grenade:
base:
rm-services: [c-vol, c-bak]
heat:
base:
services: [heat, h-api, h-api-cfn, h-api-cw, h-eng]