commit 7d9543075ac9533749e53e808bc3ad179a74b2b6
author Dean Troyer <dtroyer@gmail.com> Wed Jan 25 16:35:57 2012 -0600
committer Dean Troyer <dtroyer@gmail.com> Wed Jan 25 17:59:02 2012 -0600
tree c08b957a18beb8d7decb60cf5b42e2cf13e54595
parent 9fdabdfd14d399672bf4cb0ee904d364409f1f8f

Keystone updates

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

Change-Id: Ie3bd383e2fca14ec37379bd21d93d92d62451f3b

stack.sh

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
 

stackrc

diff --git a/stackrc b/stackrc
index 9bc3be6..6a84469 100644
--- a/stackrc
+++ b/stackrc
@@ -16,7 +16,7 @@
 
 # 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