openstack
/
grenade
Code Issues Proposed changes

Add rolling upgrade test for nova-compute 

Add rolling upgrade test for nova-compute. Nova wants to support the ability
to run stable/havana nova-compute with icehouse everything else. This sets
up a test for that.

When $DO_NOT_UPGRADE_SERVICES contains "n-cpu", the final environment
will be trunk everything except havana nova-compute.  Although
$DO_NOT_UPGRADE_SERVICES takes a list of services other parts of grenade
have to be fixed to support values besides "n-cpu", but a list is used
because in the future we want to support adding other values to this
list.

Change-Id: Ifb733ee2fe0c5bba61b43ae19dca7040c12f7893
This commit is contained in:
Joe Gordon 2013-12-25 15:17:42 -08:00
parent da7fb5d7c5
commit db1e798908
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
from-havana/upgrade-nova
View File

@ -8,6 +8,11 @@ function configure_nova_upgrade(){
# upgrade rootwrap configs
configure_nova_rootwrap
# rolling nova-compute support
if [[ "$DO_NOT_UPGRADE_SERVICES" =~ "n-cpu" ]]; then
iniset $NOVA_CONF upgrade_levels compute havana
fi
# reset to previous state
$XTRACE
}

6
grenaderc
View File

@ -76,7 +76,11 @@ TARGET_RUN_SMOKE=${TARGET_RUN_SMOKE:-$BASE_RUN_SMOKE}
# TODO(sdague): make these complete afterwards
# The services we'd expect at each release
BASE_SERVICES="nova-api nova-conductor nova-compute keystone glance-api cinder-api"
if [[ "$DO_NOT_UPGRADE_SERVICES" =~ "n-cpu" ]]; then
BASE_SERVICES="nova-api nova-conductor keystone glance-api cinder-api"
else
BASE_SERVICES="nova-api nova-conductor nova-compute keystone glance-api cinder-api"
fi
TARGET_SERVICES="nova-api nova-conductor nova-compute keystone glance-api cinder-api"
# Need this for global requirements

4
stop-base
View File

@ -39,7 +39,9 @@ if [[ -n "$SCREEN" ]]; then
OIFS=$IFS
IFS=,
for serv in $ENABLED_SERVICES; do
screen_stop $serv
if [[ ! "$DO_NOT_UPGRADE_SERVICES" =~ "$serv" ]]; then
screen_stop $serv
fi
done
IFS=$OIFS
fi

5
upgrade-nova
View File

@ -106,7 +106,10 @@ nova-manage --config-file $NOVA_CONF db sync || die $LINENO "DB sync error"
# Start Nova
start_nova_api
start_nova
if [[ ! "$DO_NOT_UPGRADE_SERVICES" =~ "n-cpu" ]]; then
start_nova_compute
fi
start_nova_rest
set +o xtrace
echo "*********************************************************************"