Merge "Always setup cells v2"
This commit is contained in:
commit
3d5a909018
7
lib/nova
7
lib/nova
@ -85,9 +85,6 @@ METADATA_SERVICE_PORT=${METADATA_SERVICE_PORT:-8775}
|
|||||||
# NOTE: Set ``FORCE_CONFIG_DRIVE="False"`` to turn OFF config drive
|
# NOTE: Set ``FORCE_CONFIG_DRIVE="False"`` to turn OFF config drive
|
||||||
FORCE_CONFIG_DRIVE=${FORCE_CONFIG_DRIVE:-"False"}
|
FORCE_CONFIG_DRIVE=${FORCE_CONFIG_DRIVE:-"False"}
|
||||||
|
|
||||||
# Option to initialize CellsV2 environment
|
|
||||||
NOVA_CONFIGURE_CELLSV2=$(trueorfalse False NOVA_CONFIGURE_CELLSV2)
|
|
||||||
|
|
||||||
# Nova supports pluggable schedulers. The default ``FilterScheduler``
|
# Nova supports pluggable schedulers. The default ``FilterScheduler``
|
||||||
# should work in most cases.
|
# should work in most cases.
|
||||||
SCHEDULER=${SCHEDULER:-filter_scheduler}
|
SCHEDULER=${SCHEDULER:-filter_scheduler}
|
||||||
@ -681,9 +678,7 @@ function init_nova {
|
|||||||
if is_service_enabled $DATABASE_BACKENDS && is_service_enabled n-api; then
|
if is_service_enabled $DATABASE_BACKENDS && is_service_enabled n-api; then
|
||||||
# (Re)create nova databases
|
# (Re)create nova databases
|
||||||
recreate_database nova
|
recreate_database nova
|
||||||
if [ "$NOVA_CONFIGURE_CELLSV2" != "False" ]; then
|
recreate_database nova_api_cell0
|
||||||
recreate_database nova_api_cell0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Migrate nova database. If "nova-manage cell_v2 simple_cell_setup" has
|
# Migrate nova database. If "nova-manage cell_v2 simple_cell_setup" has
|
||||||
# been run this migrates the "nova" and "nova_api_cell0" database.
|
# been run this migrates the "nova" and "nova_api_cell0" database.
|
||||||
|
2
stack.sh
2
stack.sh
@ -1385,7 +1385,7 @@ check_libs_from_git
|
|||||||
# ----------------------
|
# ----------------------
|
||||||
|
|
||||||
# Do this late because it requires compute hosts to have started
|
# Do this late because it requires compute hosts to have started
|
||||||
if is_service_enabled n-api && [ "$NOVA_CONFIGURE_CELLSV2" == "True" ]; then
|
if is_service_enabled n-api; then
|
||||||
create_cell
|
create_cell
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user