openstack/devstack
Code Issues Proposed changes

Merge "Add new parameter RECREATE_KEYSTONE_DB"

Browse Source
This commit is contained in:
Jenkins 2016-12-22 19:25:40 +00:00 committed by Gerrit Code Review
commit 2989054992
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/keystone
View File

@ -490,8 +490,10 @@ function init_keystone {
init_ldap init_ldap
fi fi
# (Re)create keystone database if [[ "$RECREATE_KEYSTONE_DB" == True ]]; then
recreate_database keystone # (Re)create keystone database
recreate_database keystone
fi
# Initialize keystone database # Initialize keystone database
$KEYSTONE_BIN_DIR/keystone-manage --config-file $KEYSTONE_CONF db_sync $KEYSTONE_BIN_DIR/keystone-manage --config-file $KEYSTONE_CONF db_sync

4
stackrc
View File

@ -819,6 +819,10 @@ GIT_DEPTH=${GIT_DEPTH:-0}
# Use native SSL for servers in ``SSL_ENABLED_SERVICES`` # Use native SSL for servers in ``SSL_ENABLED_SERVICES``
USE_SSL=$(trueorfalse False USE_SSL) USE_SSL=$(trueorfalse False USE_SSL)
# We may not need to recreate database in case 2 Keystone services
# sharing the same database. It would be useful for multinode Grenade tests.
RECREATE_KEYSTONE_DB=$(trueorfalse True RECREATE_KEYSTONE_DB)
# ebtables is inherently racey. If you run it by two or more processes # ebtables is inherently racey. If you run it by two or more processes
# simultaneously it will collide, badly, in the kernel and produce # simultaneously it will collide, badly, in the kernel and produce
# failures or corruption of ebtables. The only way around it is for # failures or corruption of ebtables. The only way around it is for