remove partial upgrade support for nova
Partial upgrade support was a very hacky hybrid state of no stopping some services so not everything is upgraded to new code levels. Now that we have a multinode upgrade model in the gate we don't need this any more, and we should burn this with fire so that more folks don't go down this path. Change-Id: I2b1b440aa3cccfb2b72e65e41809c359438024be
This commit is contained in:
parent
51ab3ab893
commit
8dca033c30
@ -87,15 +87,6 @@ function upgrade_project {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Determine whether grenade should be upgrading specified service, according
|
|
||||||
# to DO_NOT_UPGRADE_SERVICES
|
|
||||||
function should_upgrade {
|
|
||||||
if [[ "$DO_NOT_UPGRADE_SERVICES" =~ "$1" ]]; then
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
# Registration interfaces for external plugins
|
# Registration interfaces for external plugins
|
||||||
function register_project_for_upgrade {
|
function register_project_for_upgrade {
|
||||||
local project=$1
|
local project=$1
|
||||||
|
@ -16,16 +16,10 @@ source $BASE_DEVSTACK_DIR/lib/nova
|
|||||||
|
|
||||||
set -o xtrace
|
set -o xtrace
|
||||||
|
|
||||||
stop_nova_rest
|
stop_nova
|
||||||
|
|
||||||
# TODO(sdague): list all the services
|
# TODO(sdague): list all the services
|
||||||
SERVICES_DOWN="nova-api nova-conductor nova-scheduler"
|
SERVICES_DOWN="nova-api nova-conductor nova-scheduler nova-compute"
|
||||||
|
|
||||||
if should_upgrade "n-cpu"; then
|
|
||||||
# IF n-cpu is on do not upgrade list, then do no stop it
|
|
||||||
stop_nova_compute
|
|
||||||
SERVICES_DOWN+=" nova-compute"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# sanity check that services are actually down
|
# sanity check that services are actually down
|
||||||
ensure_services_stopped $SERVICES_DOWN
|
ensure_services_stopped $SERVICES_DOWN
|
||||||
|
@ -69,19 +69,11 @@ iniset $NOVA_CONF upgrade_levels compute auto
|
|||||||
|
|
||||||
# Start Nova
|
# Start Nova
|
||||||
start_nova_api
|
start_nova_api
|
||||||
if should_upgrade "n-cpu"; then
|
start_nova
|
||||||
start_nova_compute
|
|
||||||
fi
|
|
||||||
start_nova_rest
|
|
||||||
|
|
||||||
# Don't succeed unless the services come up
|
# Don't succeed unless the services come up
|
||||||
ensure_services_started nova-api nova-conductor
|
ensure_services_started nova-api nova-conductor nova-compute
|
||||||
ensure_logs_exist n-api n-cond
|
ensure_logs_exist n-api n-cond n-cpu
|
||||||
|
|
||||||
if should_upgrade "n-cpu"; then
|
|
||||||
ensure_services_started nova-compute
|
|
||||||
ensure_logs_exist n-cpu
|
|
||||||
fi
|
|
||||||
|
|
||||||
set +o xtrace
|
set +o xtrace
|
||||||
echo "*********************************************************************"
|
echo "*********************************************************************"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user