openstack/devstack
Code Issues Proposed changes

Merge "Changed --user to --user_id and --role to --role_id in the keystone client for consistency. Need to update keystone calls here."

Browse Source
This commit is contained in:
Jenkins 2012-05-16 18:35:43 +00:00 committed by Gerrit Code Review
commit 218a4fa532
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
files/keystone_data.sh
View File

@ -58,19 +58,19 @@ ANOTHER_ROLE=$(get_id keystone role-create --name=anotherrole)
# Add Roles to Users in Tenants # Add Roles to Users in Tenants
keystone user-role-add --user $ADMIN_USER --role $ADMIN_ROLE --tenant_id $ADMIN_TENANT keystone user-role-add --user_id $ADMIN_USER --role_id $ADMIN_ROLE --tenant_id $ADMIN_TENANT
keystone user-role-add --user $ADMIN_USER --role $ADMIN_ROLE --tenant_id $DEMO_TENANT keystone user-role-add --user_id $ADMIN_USER --role_id $ADMIN_ROLE --tenant_id $DEMO_TENANT
keystone user-role-add --user $DEMO_USER --role $ANOTHER_ROLE --tenant_id $DEMO_TENANT keystone user-role-add --user_id $DEMO_USER --role_id $ANOTHER_ROLE --tenant_id $DEMO_TENANT
# TODO(termie): these two might be dubious # TODO(termie): these two might be dubious
keystone user-role-add --user $ADMIN_USER --role $KEYSTONEADMIN_ROLE --tenant_id $ADMIN_TENANT keystone user-role-add --user_id $ADMIN_USER --role_id $KEYSTONEADMIN_ROLE --tenant_id $ADMIN_TENANT
keystone user-role-add --user $ADMIN_USER --role $KEYSTONESERVICE_ROLE --tenant_id $ADMIN_TENANT keystone user-role-add --user_id $ADMIN_USER --role_id $KEYSTONESERVICE_ROLE --tenant_id $ADMIN_TENANT
# The Member role is used by Horizon and Swift so we need to keep it: # The Member role is used by Horizon and Swift so we need to keep it:
MEMBER_ROLE=$(get_id keystone role-create --name=Member) MEMBER_ROLE=$(get_id keystone role-create --name=Member)
keystone user-role-add --user $DEMO_USER --role $MEMBER_ROLE --tenant_id $DEMO_TENANT keystone user-role-add --user_id $DEMO_USER --role_id $MEMBER_ROLE --tenant_id $DEMO_TENANT
keystone user-role-add --user $DEMO_USER --role $MEMBER_ROLE --tenant_id $INVIS_TENANT keystone user-role-add --user_id $DEMO_USER --role_id $MEMBER_ROLE --tenant_id $INVIS_TENANT
# Configure service users/roles # Configure service users/roles
@ -79,16 +79,16 @@ NOVA_USER=$(get_id keystone user-create --name=nova \
--tenant_id $SERVICE_TENANT \ --tenant_id $SERVICE_TENANT \
--email=nova@example.com) --email=nova@example.com)
keystone user-role-add --tenant_id $SERVICE_TENANT \ keystone user-role-add --tenant_id $SERVICE_TENANT \
--user $NOVA_USER \ --user_id $NOVA_USER \
--role $ADMIN_ROLE --role_id $ADMIN_ROLE
GLANCE_USER=$(get_id keystone user-create --name=glance \ GLANCE_USER=$(get_id keystone user-create --name=glance \
--pass="$SERVICE_PASSWORD" \ --pass="$SERVICE_PASSWORD" \
--tenant_id $SERVICE_TENANT \ --tenant_id $SERVICE_TENANT \
--email=glance@example.com) --email=glance@example.com)
keystone user-role-add --tenant_id $SERVICE_TENANT \ keystone user-role-add --tenant_id $SERVICE_TENANT \
--user $GLANCE_USER \ --user_id $GLANCE_USER \
--role $ADMIN_ROLE --role_id $ADMIN_ROLE
if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
SWIFT_USER=$(get_id keystone user-create --name=swift \ SWIFT_USER=$(get_id keystone user-create --name=swift \
@ -96,8 +96,8 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
--tenant_id $SERVICE_TENANT \ --tenant_id $SERVICE_TENANT \
--email=swift@example.com) --email=swift@example.com)
keystone user-role-add --tenant_id $SERVICE_TENANT \ keystone user-role-add --tenant_id $SERVICE_TENANT \
--user $SWIFT_USER \ --user_id $SWIFT_USER \
--role $ADMIN_ROLE --role_id $ADMIN_ROLE
# Nova needs ResellerAdmin role to download images when accessing # Nova needs ResellerAdmin role to download images when accessing
# swift through the s3 api. The admin role in swift allows a user # swift through the s3 api. The admin role in swift allows a user
# to act as an admin for their tenant, but ResellerAdmin is needed # to act as an admin for their tenant, but ResellerAdmin is needed
@ -105,8 +105,8 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
# configurable in swift-proxy.conf # configurable in swift-proxy.conf
RESELLER_ROLE=$(get_id keystone role-create --name=ResellerAdmin) RESELLER_ROLE=$(get_id keystone role-create --name=ResellerAdmin)
keystone user-role-add --tenant_id $SERVICE_TENANT \ keystone user-role-add --tenant_id $SERVICE_TENANT \
--user $NOVA_USER \ --user_id $NOVA_USER \
--role $RESELLER_ROLE --role_id $RESELLER_ROLE
fi fi
if [[ "$ENABLED_SERVICES" =~ "quantum" ]]; then if [[ "$ENABLED_SERVICES" =~ "quantum" ]]; then
@ -115,8 +115,8 @@ if [[ "$ENABLED_SERVICES" =~ "quantum" ]]; then
--tenant_id $SERVICE_TENANT \ --tenant_id $SERVICE_TENANT \
--email=quantum@example.com) --email=quantum@example.com)
keystone user-role-add --tenant_id $SERVICE_TENANT \ keystone user-role-add --tenant_id $SERVICE_TENANT \
--user $QUANTUM_USER \ --user_id $QUANTUM_USER \
--role $ADMIN_ROLE --role_id $ADMIN_ROLE
fi fi
if [[ "$ENABLED_SERVICES" =~ "tempest" ]]; then if [[ "$ENABLED_SERVICES" =~ "tempest" ]]; then