-if [ -z $DB_EXISTS ]; then
- keystone-manage bootstrap --bootstrap-password "$ADMIN_PASSWORD" \
- --bootstrap-admin-url http://keystone:5000/v3/ \
- --bootstrap-internal-url http://keystone:5000/v3/ \
- --bootstrap-public-url http://keystone:5000/v3/ \
- --bootstrap-region-id RegionOne
+if [ -z $DB_EXISTS ] || [ -z $DB_NOT_EMPTY ]; then
+ keystone-manage bootstrap \
+ --bootstrap-username "$ADMIN_USERNAME" \
+ --bootstrap-password "$ADMIN_PASSWORD" \
+ --bootstrap-project "$ADMIN_PROJECT" \
+ --bootstrap-admin-url "http://$KEYSTONE_HOST:5000/v3/" \
+ --bootstrap-internal-url "http://$KEYSTONE_HOST:5000/v3/" \
+ --bootstrap-public-url "http://$KEYSTONE_HOST:5000/v3/" \
+ --bootstrap-region-id "$REGION_ID"