openstack/devstack
Code Issues Proposed changes

update to get keystone working

Browse Source
This commit is contained in:
termie 2012-02-02 17:31:19 -08:00
parent 221367c0a3
commit 8a41c9dad4
4 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/apts/keystone
View File

@ -12,4 +12,4 @@ python-greenlet
python-routes
libldap2-dev
libsasl2-dev
python-bcrypt

2
files/keystone.conf
View File

@ -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

64
files/keystone_data.sh
View File

@ -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 \

2
stack.sh
View File

@ -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"