1. devstack
  2. Commit 8a41c9dad483c1da89f8763e76d76a0c9a9984b4
Browse code

update to get keystone working

termie authored on 2012/02/03 10:31:19
Showing 4 changed files
files/apts/keystone
History View file @ 8a41c9d
... ... 
@@ -12,4 +12,4 @@ python-greenlet
12 12 
 python-routes
13 13 
 libldap2-dev
14 14 
 libsasl2-dev
15 
-
15 
+python-bcrypt
files/keystone.conf
History View file @ 8a41c9d
... ... 
@@ -23,7 +23,7 @@ max_pool_size = 10
23 23 
 pool_timeout = 200
24 24
25 25 
 [identity]
26 
-driver = keystone.identity.backends.kvs.Identity
26 
+driver = keystone.identity.backends.sql.Identity
27 27
28 28 
 [catalog]
29 29 
 driver = keystone.catalog.backends.templated.TemplatedCatalog
files/keystone_data.sh
History View file @ 8a41c9d
... ... 
@@ -36,40 +36,40 @@ NETADMIN_ROLE=`$BIN_DIR/keystone-manage role --id-only create \
36 36
37 37 
 # Add Roles to Users in Tenants
38 38
39 
-$BIN_DIR/keystone-manage role add_user_to_tenant \
40 
-                              role_id=$ADMIN_ROLE \
41 
-                              user_id=$ADMIN_USER \
42 
-                              tenant_id=$ADMIN_TENANT
43 
-$BIN_DIR/keystone-manage role add_user_to_tenant \
44 
-                              role_id=$MEMBER_ROLE \
45 
-                              user_id=$DEMO_USER \
46 
-                              tenant_id=$DEMO_TENANT
47 
-$BIN_DIR/keystone-manage role add_user_to_tenant \
48 
-                              role_id=$SYSADMIN_ROLE \
49 
-                              user_id=$DEMO_USER \
50 
-                              tenant_id=$DEMO_TENANT
51 
-$BIN_DIR/keystone-manage role add_user_to_tenant \
52 
-                              role_id=$NETADMIN_ROLE \
53 
-                              user_id=$DEMO_USER \
54 
-                              tenant_id=$DEMO_TENANT
55 
-$BIN_DIR/keystone-manage role add_user_to_tenant \
56 
-                              role_id=$MEMBER_ROLE \
57 
-                              user_id=$DEMO_USER \
58 
-                              tenant_id=$INVIS_TENANT
59 
-$BIN_DIR/keystone-manage role add_user_to_tenant \
60 
-                              role_id=$ADMIN_ROLE \
61 
-                              user_id=$ADMIN_USER \
62 
-                              tenant_id=$DEMO_TENANT
39 
+$BIN_DIR/keystone-manage role add_user_role \
40 
+                              role=$ADMIN_ROLE \
41 
+                              user=$ADMIN_USER \
42 
+                              tenant=$ADMIN_TENANT
43 
+$BIN_DIR/keystone-manage role add_user_role \
44 
+                              role=$MEMBER_ROLE \
45 
+                              user=$DEMO_USER \
46 
+                              tenant=$DEMO_TENANT
47 
+$BIN_DIR/keystone-manage role add_user_role \
48 
+                              role=$SYSADMIN_ROLE \
49 
+                              user=$DEMO_USER \
50 
+                              tenant=$DEMO_TENANT
51 
+$BIN_DIR/keystone-manage role add_user_role \
52 
+                              role=$NETADMIN_ROLE \
53 
+                              user=$DEMO_USER \
54 
+                              tenant=$DEMO_TENANT
55 
+$BIN_DIR/keystone-manage role add_user_role \
56 
+                              role=$MEMBER_ROLE \
57 
+                              user=$DEMO_USER \
58 
+                              tenant=$INVIS_TENANT
59 
+$BIN_DIR/keystone-manage role add_user_role \
60 
+                              role=$ADMIN_ROLE \
61 
+                              user=$ADMIN_USER \
62 
+                              tenant=$DEMO_TENANT
63 63
64 64 
 # TODO(termie): these two might be dubious
65 
-$BIN_DIR/keystone-manage role add_user_to_tenant \
66 
-                              role_id=$KEYSTONEADMIN_ROLE \
67 
-                              user_id=$ADMIN_USER \
68 
-                              tenant_id=$ADMIN_TENANT
69 
-$BIN_DIR/keystone-manage role add_user_to_tenant \
70 
-                              role_id=$KEYSTONESERVICE_ROLE \
71 
-                              user_id=$ADMIN_USER \
72 
-                              tenant_id=$ADMIN_TENANT
65 
+$BIN_DIR/keystone-manage role add_user_role \
66 
+                              role=$KEYSTONEADMIN_ROLE \
67 
+                              user=$ADMIN_USER \
68 
+                              tenant=$ADMIN_TENANT
69 
+$BIN_DIR/keystone-manage role add_user_role \
70 
+                              role=$KEYSTONESERVICE_ROLE \
71 
+                              user=$ADMIN_USER \
72 
+                              tenant=$ADMIN_TENANT
73 73
74 74 
 # Services
75 75 
 $BIN_DIR/keystone-manage service create \
stack.sh
History View file @ 8a41c9d
... ... 
@@ -1373,7 +1373,7 @@ fi
1373 1373
1374 1374 
 # launch the keystone and wait for it to answer before continuing
1375 1375 
 if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
1376 
-    screen_it key "cd $KEYSTONE_DIR && $KEYSTONE_DIR/bin/keystone --config-file $KEYSTONE_CONF $KEYSTONE_LOG_CONFIG -d --debug"
1376 
+    screen_it key "cd $KEYSTONE_DIR && $KEYSTONE_DIR/bin/keystone-all --config-file $KEYSTONE_CONF $KEYSTONE_LOG_CONFIG -d --debug"
1377 1377 
     echo "Waiting for keystone to start..."
1378 1378 
     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
1379 1379 
       echo "keystone did not start"