openstack
/
grenade
Code Issues Proposed changes

Run the placement service when upgrading to Ocata 

Now the placement service is mandatory in Ocata, we need to modify Grenade
to deploy that service even if the source local.conf is not providing it.

Note that we need to do this as part of nova right now because the
code for placement is in the nova tree. If we do it before and separately,
we end up starting a newton placement service, which is not enough for
ocata nova (and/or we partially upgrade nova from 55_placement, which
breaks within-$release and my brain).

Change-Id: I573149b9415da2a8bb3951a4c4ce71c4c3e48c6f
This commit is contained in:
Sylvain Bauza 2017-01-24 17:29:02 +01:00 committed by Dan Smith
parent 489202bd70
commit a1ea5cec06
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
projects/60_nova/from-newton/upgrade-nova
View File

@ -1,5 +1,8 @@
source $TARGET_DEVSTACK_DIR/lib/database
source $TARGET_DEVSTACK_DIR/lib/rpc_backend
source $TARGET_DEVSTACK_DIR/lib/keystone
source $TARGET_DEVSTACK_DIR/lib/placement
source $GRENADE_DIR/inc/bootstrap
function configure_nova_upgrade() {
# Perform an unconditional simple setup of the cells v2 models and mappings
@ -13,4 +16,20 @@ function configure_nova_upgrade() {
# re-created.
($NOVA_BIN_DIR/nova-manage cell_v2 map_cell0 --database_connection $(database_connection_url nova_cell0) || true)
$NOVA_BIN_DIR/nova-manage cell_v2 simple_cell_setup --transport-url $(get_transport_url)
# Make sure we enable the Placement API before rolling out Ocata since it's
# now mandatory.
# Set for DevStack compatibility
TOP_DIR=$TARGET_DEVSTACK_DIR
source $TOP_DIR/openrc admin admin
FILES=$TARGET_DEVSTACK_DIR/files
stack_install_service placement
cleanup_placement
configure_placement
configure_placement_nova_compute
init_placement
devstack_localrc target enable_service placement
}

4
projects/60_nova/upgrade.sh
View File

@ -42,6 +42,7 @@ source $TARGET_DEVSTACK_DIR/lib/tls
source $TARGET_DEVSTACK_DIR/lib/apache
source $TARGET_DEVSTACK_DIR/lib/nova
source $TARGET_DEVSTACK_DIR/lib/rpc_backend
source $TARGET_DEVSTACK_DIR/lib/placement
# Print the commands being run so that we can see the command that triggers
# an error. It is also useful for following allowing as the install occurs.
@ -82,9 +83,10 @@ fi
# Start Nova
start_nova_api
start_nova
start_placement
# Don't succeed unless the services come up
ensure_services_started nova-api nova-conductor nova-compute
ensure_services_started nova-api nova-conductor nova-compute placement
ensure_logs_exist n-api n-cond n-cpu
if [[ "$FORCE_ONLINE_MIGRATIONS" == "True" ]]; then