Shutdown placement at the end of the base run

Placement API was not being shutdown at the end of the OLD target,
thus when it was being started at the beginning of the NEW target it
was not actually getting new code. A call to stop_placement is added.

In addition, make sure placement is installed in upgrade.sh so that
any new stuff is in place.

The depends-on is to a devstack change which makes sure that
lib/placement does not call remove_uwsgi_config when stop_placement is
called. Without this, there's no config file for the
devstack@placement-api systemd unit to run, and there is an immediate
exit.

Change-Id: I7f2158aeaef82a47e11c6e29675e542023fff4be
Depends-On: Iee763adf7895145d97b184924896db3f1f48a015
Closes-Bug: #1736385
This commit is contained in:
Chris Dent 2017-12-05 13:21:19 +00:00
parent 3825ab8ac7
commit b7dbc632b6
2 changed files with 5 additions and 2 deletions

View File

@ -13,16 +13,18 @@ source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
source $BASE_DEVSTACK_DIR/lib/tls
source $BASE_DEVSTACK_DIR/lib/apache
source $BASE_DEVSTACK_DIR/lib/nova
source $BASE_DEVSTACK_DIR/lib/placement
set -o xtrace
stop_placement
stop_nova
# FIXME(dims): Once devstack gets fixed in both master and stable
# branches, we can remove this extra stop_process
stop_process n-cond
# TODO(sdague): list all the services
SERVICES_DOWN="nova-api nova-conductor nova-scheduler nova-compute"
SERVICES_DOWN="nova-api nova-conductor nova-scheduler nova-compute placement-api"
# sanity check that services are actually down
ensure_services_stopped $SERVICES_DOWN

View File

@ -60,8 +60,9 @@ set -o xtrace
# calls pre-upgrade hooks for within-$base before we upgrade
upgrade_project nova $RUN_DIR $BASE_DEVSTACK_BRANCH $BASE_DEVSTACK_BRANCH
# install_nova()
# install_nova() and placement
stack_install_service nova
stack_install_service placement
# calls upgrade-nova for specific release
upgrade_project nova $RUN_DIR $BASE_DEVSTACK_BRANCH $TARGET_DEVSTACK_BRANCH