openstack/devstack
Code Issues Proposed changes

Merge "nova: call map_cell0 much earlier in the setup"

Browse Source
This commit is contained in:
Jenkins 2017-03-01 18:08:11 +00:00 committed by Gerrit Code Review
commit 24b58a9a1a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/nova
View File

@ -704,9 +704,13 @@ function init_nova {
recreate_database nova recreate_database nova
recreate_database nova_cell0 recreate_database nova_cell0
# Migrate nova database. If "nova-manage cell_v2 simple_cell_setup" has # map_cell0 will create the cell mapping record in the nova_api DB so
# been run this migrates the "nova" and "nova_cell0" database. # this needs to come after the api_db sync happens. We also want to run
# Otherwise it just migrates the "nova" database. # this before the db sync below since that will migrate both the nova
# and nova_cell0 databases.
nova-manage cell_v2 map_cell0 --database_connection `database_connection_url nova_cell0`
# Migrate nova and nova_cell0 databases.
$NOVA_BIN_DIR/nova-manage --config-file $NOVA_CONF db sync $NOVA_BIN_DIR/nova-manage --config-file $NOVA_CONF db sync
if is_service_enabled n-cell; then if is_service_enabled n-cell; then
@ -966,9 +970,6 @@ function create_flavors {
# create_cell(): Group the available hosts into a cell # create_cell(): Group the available hosts into a cell
function create_cell { function create_cell {
# NOTE(danms): map_cell0 always returns 1 right now; remove this when that is fixed
(nova-manage cell_v2 map_cell0 --database_connection `database_connection_url nova_cell0`|| true)
if ! is_service_enabled n-cell; then if ! is_service_enabled n-cell; then
nova-manage cell_v2 simple_cell_setup --transport-url $(get_transport_url) nova-manage cell_v2 simple_cell_setup --transport-url $(get_transport_url)
else else