From 7d9543075ac9533749e53e808bc3ad179a74b2b6 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Wed, 25 Jan 2012 16:35:57 -0600
Subject: [PATCH] Keystone updates

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

Change-Id: Ie3bd383e2fca14ec37379bd21d93d92d62451f3b
---
 stack.sh | 4 ++++
 stackrc  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/stack.sh b/stack.sh
index f2ca9d512d..21195fc289 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1289,6 +1289,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
 
diff --git a/stackrc b/stackrc
index 9bc3be6f44..6a844698a4 100644
--- a/stackrc
+++ b/stackrc
@@ -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