Keystone updates

* use master branch (was stable/diablo)
* add database sync

Change-Id: Ie3bd383e2fca14ec37379bd21d93d92d62451f3b
diff --git a/stack.sh b/stack.sh
index f2ca9d5..21195fc 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1289,6 +1289,10 @@
         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