openstack/devstack
Code Issues Proposed changes

Merge "Create and initialize the nova api_db"

Browse Source
This commit is contained in:
Jenkins 2015-06-11 22:16:42 +00:00 committed by Gerrit Code Review
commit 7b66c4f7af
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/nova
View File

@ -53,6 +53,7 @@ NOVA_CONF=$NOVA_CONF_DIR/nova.conf
NOVA_CELLS_CONF=$NOVA_CONF_DIR/nova-cells.conf NOVA_CELLS_CONF=$NOVA_CONF_DIR/nova-cells.conf
NOVA_FAKE_CONF=$NOVA_CONF_DIR/nova-fake.conf NOVA_FAKE_CONF=$NOVA_CONF_DIR/nova-fake.conf
NOVA_CELLS_DB=${NOVA_CELLS_DB:-nova_cell} NOVA_CELLS_DB=${NOVA_CELLS_DB:-nova_cell}
NOVA_API_DB=${NOVA_API_DB:-nova_api}
NOVA_API_PASTE_INI=${NOVA_API_PASTE_INI:-$NOVA_CONF_DIR/api-paste.ini} NOVA_API_PASTE_INI=${NOVA_API_PASTE_INI:-$NOVA_CONF_DIR/api-paste.ini}
# NOVA_API_VERSION valid options # NOVA_API_VERSION valid options
@ -471,6 +472,7 @@ function create_nova_conf {
iniset $NOVA_CONF DEFAULT s3_port "$S3_SERVICE_PORT" iniset $NOVA_CONF DEFAULT s3_port "$S3_SERVICE_PORT"
iniset $NOVA_CONF DEFAULT my_ip "$HOST_IP" iniset $NOVA_CONF DEFAULT my_ip "$HOST_IP"
iniset $NOVA_CONF database connection `database_connection_url nova` iniset $NOVA_CONF database connection `database_connection_url nova`
iniset $NOVA_CONF api_database connection `database_connection_url nova_api`
iniset $NOVA_CONF DEFAULT instance_name_template "${INSTANCE_NAME_PREFIX}%08x" iniset $NOVA_CONF DEFAULT instance_name_template "${INSTANCE_NAME_PREFIX}%08x"
iniset $NOVA_CONF osapi_v3 enabled "True" iniset $NOVA_CONF osapi_v3 enabled "True"
@ -675,6 +677,9 @@ function init_nova {
if is_service_enabled n-cell; then if is_service_enabled n-cell; then
recreate_database $NOVA_CELLS_DB recreate_database $NOVA_CELLS_DB
fi fi
recreate_database $NOVA_API_DB
$NOVA_BIN_DIR/nova-manage api_db sync
fi fi
create_nova_cache_dir create_nova_cache_dir