@@ -1291,6 +1291,10 @@ if [[ "$ENABLED_SERVICES" =~ "key" ]]; then

         s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g;

         s,%ADMIN_PASSWORD%,$ADMIN_PASSWORD,g;

     " -i $KEYSTONE_DATA

+

+    # Prepare up the database

+    $KEYSTONE_DIR/bin/keystone-manage sync_database

+

     # initialize keystone with default users/endpoints

     ENABLED_SERVICES=$ENABLED_SERVICES BIN_DIR=$KEYSTONE_DIR/bin bash $KEYSTONE_DATA

@@ -16,7 +16,7 @@ GLANCE_BRANCH=master

 # unified auth system (manages accounts/tokens)

 KEYSTONE_REPO=https://github.com/openstack/keystone.git

-KEYSTONE_BRANCH=stable/diablo

+KEYSTONE_BRANCH=master

 # a websockets/html5 or flash powered VNC console for vm instances

 NOVNC_REPO=https://github.com/cloudbuilders/noVNC.git