* use master branch (was stable/diablo)
* add database sync
Change-Id: Ie3bd383e2fca14ec37379bd21d93d92d62451f3b
... | ... |
@@ -1289,6 +1289,10 @@ if [[ "$ENABLED_SERVICES" =~ "key" ]]; then |
1289 | 1289 |
s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g; |
1290 | 1290 |
s,%ADMIN_PASSWORD%,$ADMIN_PASSWORD,g; |
1291 | 1291 |
" -i $KEYSTONE_DATA |
1292 |
+ |
|
1293 |
+ # Prepare up the database |
|
1294 |
+ $KEYSTONE_DIR/bin/keystone-manage sync_database |
|
1295 |
+ |
|
1292 | 1296 |
# initialize keystone with default users/endpoints |
1293 | 1297 |
ENABLED_SERVICES=$ENABLED_SERVICES BIN_DIR=$KEYSTONE_DIR/bin bash $KEYSTONE_DATA |
1294 | 1298 |
|
... | ... |
@@ -16,7 +16,7 @@ GLANCE_BRANCH=master |
16 | 16 |
|
17 | 17 |
# unified auth system (manages accounts/tokens) |
18 | 18 |
KEYSTONE_REPO=https://github.com/openstack/keystone.git |
19 |
-KEYSTONE_BRANCH=stable/diablo |
|
19 |
+KEYSTONE_BRANCH=master |
|
20 | 20 |
|
21 | 21 |
# a websockets/html5 or flash powered VNC console for vm instances |
22 | 22 |
NOVNC_REPO=https://github.com/cloudbuilders/noVNC.git |