Merge "Add new parameter RECREATE_KEYSTONE_DB" into stable/newton

This commit is contained in:
Jenkins 2017-01-11 03:54:07 +00:00 committed by Gerrit Code Review
commit b9f95718e1
2 changed files with 8 additions and 2 deletions

View File

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

View File

@ -827,6 +827,10 @@ GIT_DEPTH=${GIT_DEPTH:-0}
# Use native SSL for servers in ``SSL_ENABLED_SERVICES``
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
# simultaneously it will collide, badly, in the kernel and produce
# failures or corruption of ebtables. The only way around it is for