From 8a41c9dad483c1da89f8763e76d76a0c9a9984b4 Mon Sep 17 00:00:00 2001
From: termie <github@anarkystic.com>
Date: Thu, 2 Feb 2012 17:31:19 -0800
Subject: [PATCH] update to get keystone working

---
 files/apts/keystone    |  2 +-
 files/keystone.conf    |  2 +-
 files/keystone_data.sh | 64 +++++++++++++++++++++---------------------
 stack.sh               |  2 +-
 4 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/files/apts/keystone b/files/apts/keystone
index 6e6d3d53ab..94479c9251 100644
--- a/files/apts/keystone
+++ b/files/apts/keystone
@@ -12,4 +12,4 @@ python-greenlet
 python-routes
 libldap2-dev
 libsasl2-dev
-
+python-bcrypt
diff --git a/files/keystone.conf b/files/keystone.conf
index 745abeea2f..1155d92536 100644
--- a/files/keystone.conf
+++ b/files/keystone.conf
@@ -23,7 +23,7 @@ max_pool_size = 10
 pool_timeout = 200
 
 [identity]
-driver = keystone.identity.backends.kvs.Identity
+driver = keystone.identity.backends.sql.Identity
 
 [catalog]
 driver = keystone.catalog.backends.templated.TemplatedCatalog
diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index d6ddcb34f5..75260841fc 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -36,40 +36,40 @@ NETADMIN_ROLE=`$BIN_DIR/keystone-manage role --id-only create \
 
 # Add Roles to Users in Tenants
 
-$BIN_DIR/keystone-manage role add_user_to_tenant \
-                              role_id=$ADMIN_ROLE \
-                              user_id=$ADMIN_USER \
-                              tenant_id=$ADMIN_TENANT
-$BIN_DIR/keystone-manage role add_user_to_tenant \
-                              role_id=$MEMBER_ROLE \
-                              user_id=$DEMO_USER \
-                              tenant_id=$DEMO_TENANT
-$BIN_DIR/keystone-manage role add_user_to_tenant \
-                              role_id=$SYSADMIN_ROLE \
-                              user_id=$DEMO_USER \
-                              tenant_id=$DEMO_TENANT
-$BIN_DIR/keystone-manage role add_user_to_tenant \
-                              role_id=$NETADMIN_ROLE \
-                              user_id=$DEMO_USER \
-                              tenant_id=$DEMO_TENANT
-$BIN_DIR/keystone-manage role add_user_to_tenant \
-                              role_id=$MEMBER_ROLE \
-                              user_id=$DEMO_USER \
-                              tenant_id=$INVIS_TENANT
-$BIN_DIR/keystone-manage role add_user_to_tenant \
-                              role_id=$ADMIN_ROLE \
-                              user_id=$ADMIN_USER \
-                              tenant_id=$DEMO_TENANT
+$BIN_DIR/keystone-manage role add_user_role \
+                              role=$ADMIN_ROLE \
+                              user=$ADMIN_USER \
+                              tenant=$ADMIN_TENANT
+$BIN_DIR/keystone-manage role add_user_role \
+                              role=$MEMBER_ROLE \
+                              user=$DEMO_USER \
+                              tenant=$DEMO_TENANT
+$BIN_DIR/keystone-manage role add_user_role \
+                              role=$SYSADMIN_ROLE \
+                              user=$DEMO_USER \
+                              tenant=$DEMO_TENANT
+$BIN_DIR/keystone-manage role add_user_role \
+                              role=$NETADMIN_ROLE \
+                              user=$DEMO_USER \
+                              tenant=$DEMO_TENANT
+$BIN_DIR/keystone-manage role add_user_role \
+                              role=$MEMBER_ROLE \
+                              user=$DEMO_USER \
+                              tenant=$INVIS_TENANT
+$BIN_DIR/keystone-manage role add_user_role \
+                              role=$ADMIN_ROLE \
+                              user=$ADMIN_USER \
+                              tenant=$DEMO_TENANT
 
 # TODO(termie): these two might be dubious
-$BIN_DIR/keystone-manage role add_user_to_tenant \
-                              role_id=$KEYSTONEADMIN_ROLE \
-                              user_id=$ADMIN_USER \
-                              tenant_id=$ADMIN_TENANT
-$BIN_DIR/keystone-manage role add_user_to_tenant \
-                              role_id=$KEYSTONESERVICE_ROLE \
-                              user_id=$ADMIN_USER \
-                              tenant_id=$ADMIN_TENANT
+$BIN_DIR/keystone-manage role add_user_role \
+                              role=$KEYSTONEADMIN_ROLE \
+                              user=$ADMIN_USER \
+                              tenant=$ADMIN_TENANT
+$BIN_DIR/keystone-manage role add_user_role \
+                              role=$KEYSTONESERVICE_ROLE \
+                              user=$ADMIN_USER \
+                              tenant=$ADMIN_TENANT
 
 # Services
 $BIN_DIR/keystone-manage service create \
diff --git a/stack.sh b/stack.sh
index 33665e21d7..2bac11cdb9 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1373,7 +1373,7 @@ fi
 
 # launch the keystone and wait for it to answer before continuing
 if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
-    screen_it key "cd $KEYSTONE_DIR && $KEYSTONE_DIR/bin/keystone --config-file $KEYSTONE_CONF $KEYSTONE_LOG_CONFIG -d --debug"
+    screen_it key "cd $KEYSTONE_DIR && $KEYSTONE_DIR/bin/keystone-all --config-file $KEYSTONE_CONF $KEYSTONE_LOG_CONFIG -d --debug"
     echo "Waiting for keystone to start..."
     if ! timeout $SERVICE_TIMEOUT sh -c "while ! http_proxy= wget -q -O- $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v2.0/; do sleep 1; done"; then
       echo "keystone did not start"