Nova is going to land a database migration in Ocata
under change I72fb724dc13e1a5f4e97c58915b538ba761c582d
which enforces that at least the simple cells v2 setup
is performed, which creates the cell mappings, cell0 and
host mappings. Before we can land that change in Nova
we have to make cells v2 setup a default in the integrated
gate jobs.
Depends-On: Ie44e615384df464516aa30b9044b5e54b7d995bb
Change-Id: If1af9c478e8ea2420f2523a9bb8b70fafddc86b7
... | ... |
@@ -85,9 +85,6 @@ METADATA_SERVICE_PORT=${METADATA_SERVICE_PORT:-8775} |
85 | 85 |
# NOTE: Set ``FORCE_CONFIG_DRIVE="False"`` to turn OFF config drive |
86 | 86 |
FORCE_CONFIG_DRIVE=${FORCE_CONFIG_DRIVE:-"False"} |
87 | 87 |
|
88 |
-# Option to initialize CellsV2 environment |
|
89 |
-NOVA_CONFIGURE_CELLSV2=$(trueorfalse False NOVA_CONFIGURE_CELLSV2) |
|
90 |
- |
|
91 | 88 |
# Nova supports pluggable schedulers. The default ``FilterScheduler`` |
92 | 89 |
# should work in most cases. |
93 | 90 |
SCHEDULER=${SCHEDULER:-filter_scheduler} |
... | ... |
@@ -681,9 +678,7 @@ function init_nova { |
681 | 681 |
if is_service_enabled $DATABASE_BACKENDS && is_service_enabled n-api; then |
682 | 682 |
# (Re)create nova databases |
683 | 683 |
recreate_database nova |
684 |
- if [ "$NOVA_CONFIGURE_CELLSV2" != "False" ]; then |
|
685 |
- recreate_database nova_api_cell0 |
|
686 |
- fi |
|
684 |
+ recreate_database nova_api_cell0 |
|
687 | 685 |
|
688 | 686 |
# Migrate nova database. If "nova-manage cell_v2 simple_cell_setup" has |
689 | 687 |
# been run this migrates the "nova" and "nova_api_cell0" database. |
... | ... |
@@ -1380,7 +1380,7 @@ check_libs_from_git |
1380 | 1380 |
# ---------------------- |
1381 | 1381 |
|
1382 | 1382 |
# Do this late because it requires compute hosts to have started |
1383 |
-if is_service_enabled n-api && [ "$NOVA_CONFIGURE_CELLSV2" == "True" ]; then |
|
1383 |
+if is_service_enabled n-api; then |
|
1384 | 1384 |
create_cell |
1385 | 1385 |
fi |
1386 | 1386 |
|