openstack/devstack-gate
Code Issues Proposed changes

Merge "Add dstat to subnode in multinode mode"

Browse Source
This commit is contained in:
Jenkins
2015-05-06 16:16:04 +00:00
committed by Gerrit Code Review
parent a89961a32d dad4e8d92e
commit bfcc0e35de
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
devstack-vm-gate.sh
View File

@@ -89,8 +89,9 @@ function setup_localrc {
# TODO(afazekas): Move to the feature grid
# TODO(afazekas): add c-vol
if [[ $role = sub ]]; then
MY_ENABLED_SERVICES="n-cpu,ceilometer-acompute,dstat"
if [[ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]]; then
MY_ENABLED_SERVICES="q-agt,n-cpu,ceilometer-acompute"
MY_ENABLED_SERVICES+=",q-agt"
if [[ "$DEVSTACK_GATE_NEUTRON_DVR" -eq "1" ]]; then
# As per reference architecture described in
# https://wiki.openstack.org/wiki/Neutron/DVR
@@ -99,7 +100,7 @@ function setup_localrc {
MY_ENABLED_SERVICES+=",q-l3,q-fwaas,q-meta"
fi
else
MY_ENABLED_SERVICES="n-cpu,n-net,n-api-meta,ceilometer-acompute"
MY_ENABLED_SERVICES+=",n-net,n-api-meta"
fi
fi