openstack/grenade
Code Issues Proposed changes

Drop NOVA_CONFIGURE_CELLSV2 variable

Browse Source 
Cells v2 has been required for nova since Ocata
so we can drop the conditional logic on the
NOVA_CONFIGURE_CELLSV2 variable, set by the (now branch-specific)
neutron-grenade job. The only remaining check for
the variable is in the from-mitaka script (which might
be irrelevant at this point given mitaka and newton
are both end of life).

Change-Id: Ic3101ef5f82b3341772a591669ff96bf9ab72ab6
This commit is contained in:
Matt Riedemann 2018-09-12 13:49:01 -04:00
parent 7d77f5010a
commit 67aa2195f2
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
projects/60_nova/from-mitaka/upgrade-nova
View File

@ -1,4 +1,5 @@
function configure_nova_upgrade() {
# Grenade jobs to upgrade from mitaka to newton set NOVA_CONFIGURE_CELLSV2.
if [ "$NOVA_CONFIGURE_CELLSV2" == "True" ]; then
source $TARGET_DEVSTACK_DIR/lib/database
# We need to create the cell0 database before we can sync it

7
projects/60_nova/resources.sh
View File

@ -163,11 +163,8 @@ function verify {
uuid=$(resource_get nova nova_server_uuid)
if [[ "$side" = "post-upgrade" ]]; then
# We can only verify the cells v2 setup if we created the mappings by
# calling simple_cell_setup.
if [ "$NOVA_CONFIGURE_CELLSV2" == "True" ]; then
nova-manage cell_v2 verify_instance --uuid $uuid
fi
# Verify the cells v2 simple_cell_setup
nova-manage cell_v2 verify_instance --uuid $uuid
fi
# Verify inventory and allocation values (requires admin)

8
projects/60_nova/upgrade.sh
View File

@ -81,11 +81,9 @@ if [[ "$FORCE_ONLINE_MIGRATIONS" == "True" ]]; then
$NOVA_BIN_DIR/nova-manage --config-file $NOVA_CONF db online_data_migrations || die $LINENO "Failed to run online_data_migrations"
fi
# Setup cellsv2 records, if necessary.
if [ "$NOVA_CONFIGURE_CELLSV2" == "True" ]; then
$NOVA_BIN_DIR/nova-manage cell_v2 map_cell0 --database_connection $(database_connection_url nova_cell0)
$NOVA_BIN_DIR/nova-manage cell_v2 simple_cell_setup --transport-url $(get_transport_url)
fi
# Setup cellsv2 records
$NOVA_BIN_DIR/nova-manage cell_v2 map_cell0 --database_connection $(database_connection_url nova_cell0)
$NOVA_BIN_DIR/nova-manage cell_v2 simple_cell_setup --transport-url $(get_transport_url)
# Start the Placement service - this needs to be running before the nova-status
# upgrade check command is run since that validates that we can connect to