From f166081d0e4a3b04b157a25e94f0bb2a1769f813 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Tue, 1 Nov 2016 15:44:06 -0400 Subject: [PATCH] Always setup cells v2 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 --- lib/nova | 7 +------ stack.sh | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/nova b/lib/nova index f38fb8b146..09b4aa5587 100644 --- a/lib/nova +++ b/lib/nova @@ -85,9 +85,6 @@ METADATA_SERVICE_PORT=${METADATA_SERVICE_PORT:-8775} # NOTE: Set ``FORCE_CONFIG_DRIVE="False"`` to turn OFF config drive 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`` # should work in most cases. SCHEDULER=${SCHEDULER:-filter_scheduler} @@ -681,9 +678,7 @@ function init_nova { if is_service_enabled $DATABASE_BACKENDS && is_service_enabled n-api; then # (Re)create nova databases recreate_database nova - if [ "$NOVA_CONFIGURE_CELLSV2" != "False" ]; then - recreate_database nova_api_cell0 - fi + recreate_database nova_api_cell0 # Migrate nova database. If "nova-manage cell_v2 simple_cell_setup" has # been run this migrates the "nova" and "nova_api_cell0" database. diff --git a/stack.sh b/stack.sh index fab2edd299..e908a9a335 100755 --- a/stack.sh +++ b/stack.sh @@ -1380,7 +1380,7 @@ check_libs_from_git # ---------------------- # 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 fi