openstack/devstack
Code Issues Proposed changes

Merge "Always setup cells v2"

Browse Source
This commit is contained in:
Jenkins 2016-12-02 18:14:39 +00:00 committed by Gerrit Code Review
commit 3d5a909018
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/nova
View File

@ -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.

2
stack.sh
View File

@ -1385,7 +1385,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