openstack/devstack-gate
Code Issues Proposed changes

prune grenade service lists to things we can upgrade

Browse Source 
We should only install services in grenade that we know how to
upgrade, otherwise we can run into an issue where we install a
service on the old side, it injects some code using entry points
into other projects, we don't upgrade it, it breaks that service
from upgrading. aka: ceilometer.

We really should have a policy that we only enable services in
grenade that we are going to upgrade. It also calls out nicely
which services those *aren't*.

This patch also does some normalization of the service lists since
we no longer need to support folsom, so cinder and swift should
always be enabled. There is probably a more clever service selector
that could be done here, but this is at least more straight forward
for reviewing.

Change-Id: I4e3975d74082f99b8f13d99a0865886b0e462ae3
This commit is contained in:
Sean Dague
2013-12-23 08:22:28 -05:00
parent e59dbd4b70
commit b1310d71d7
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
devstack-vm-gate.sh
View File

@@ -32,6 +32,7 @@ function setup_localrc() {
fi
DEFAULT_ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-sch,horizon,mysql,rabbit,sysstat
DEFAULT_ENABLED_SERVICES+=,s-proxy,s-account,s-container,s-object,cinder,c-api,c-vol,c-sch,n-cond
# Allow optional injection of ENABLED_SERVICES from the calling context
if [ -z $ENABLED_SERVICES ] ; then
@@ -47,7 +48,6 @@ function setup_localrc() {
SKIP_EXERCISES=boot_from_volume,client-env
if [ "$LOCALRC_BRANCH" == "stable/grizzly" ]; then
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,s-proxy,s-account,s-container,s-object,cinder,c-api,c-vol,c-sch,n-cond
if [ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]; then
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta
echo "Q_USE_DEBUG_COMMAND=True" >>localrc
@@ -59,7 +59,14 @@ function setup_localrc() {
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-cell
fi
elif [ "$LOCALRC_BRANCH" == "stable/havana" ]; then
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,s-proxy,s-account,s-container,s-object,cinder,c-api,c-vol,c-sch,c-bak,n-cond,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api
MY_ENABLED_SERVICES+=,c-bak
# we don't want to enable services for grenade that don't have upgrade support
# otherwise they can break grenade, especially when they are projects like
# ceilometer which inject code in other projects
if [ "$DEVSTACK_GATE_GRENADE" -ne "1" ]; then
MY_ENABLED_SERVICES+=,heat,h-api,h-api-cfn,h-api-cw,h-eng
MY_ENABLED_SERVICES+=,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api
fi
if [ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]; then
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-lbaas,q-vpn
echo "Q_USE_DEBUG_COMMAND=True" >>localrc
@@ -71,7 +78,14 @@ function setup_localrc() {
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-cell
fi
else # master
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,s-proxy,s-account,s-container,s-object,cinder,c-api,c-vol,c-sch,c-bak,n-cond,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator
MY_ENABLED_SERVICES+=,c-bak
# we don't want to enable services for grenade that don't have upgrade support
# otherwise they can break grenade, especially when they are projects like
# ceilometer which inject code in other projects
if [ "$DEVSTACK_GATE_GRENADE" -ne "1" ]; then
MY_ENABLED_SERVICES+=,heat,h-api,h-api-cfn,h-api-cw,h-eng
MY_ENABLED_SERVICES+=,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator
fi
if [ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]; then
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-lbaas,q-vpn
echo "Q_USE_DEBUG_COMMAND=True" >>localrc