openstack/training-guides
Code Issues Proposed changes

Merge "Functional changes in keystone (part 2) to match Juno"

Browse Source
This commit is contained in:
Jenkins
2015-02-19 20:22:35 +00:00
committed by Gerrit Code Review
parent 362556a549 c690c5cc49
commit 4e9df21a25
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
labs/scripts/ubuntu/setup_keystone.sh
View File

@@ -88,9 +88,12 @@ echo "Adding admin tenant."
keystone tenant-create --name "$ADMIN_TENANT_NAME" --description "Admin Tenant" keystone tenant-create --name "$ADMIN_TENANT_NAME" --description "Admin Tenant"
echo "Creating admin user." echo "Creating admin user."
keystone user-create --name "$ADMIN_USER_NAME" --pass "$ADMIN_PASSWORD" --email "admin@$MAIL_DOMAIN" keystone user-create \
--name "$ADMIN_USER_NAME" \
--pass "$ADMIN_PASSWORD" \
--email "admin@$MAIL_DOMAIN"
echo "Creating admin roles." echo "Creating admin role."
keystone role-create --name "$ADMIN_ROLE_NAME" keystone role-create --name "$ADMIN_ROLE_NAME"
echo "Linking admin user, admin role and admin tenant." echo "Linking admin user, admin role and admin tenant."
@@ -99,23 +102,17 @@ keystone user-role-add \
--tenant "$ADMIN_TENANT_NAME" \ --tenant "$ADMIN_TENANT_NAME" \
--role "$ADMIN_ROLE_NAME" --role "$ADMIN_ROLE_NAME"
echo "Linking admin user, _member_ role, and admin tenant."
keystone user-role-add \
--tenant "$ADMIN_TENANT_NAME" \
--user "$ADMIN_USER_NAME" \
--role "$MEMBER_ROLE_NAME"
echo "Creating demo tenant." echo "Creating demo tenant."
keystone tenant-create --name "$DEMO_TENANT_NAME" --description "Demo Tenant" keystone tenant-create --name "$DEMO_TENANT_NAME" --description "Demo Tenant"
echo "Creating demo user." echo "Creating demo user."
keystone user-create --name "$DEMO_USER_NAME" --pass "$DEMO_PASSWORD" --email "demo@$MAIL_DOMAIN" # Using the --tenant option automatically assigns the _member_ role to a user.
# This option will also create the _member_ role if it does not exist.
echo "Linking the demo user, _member_ role, and demo tenant." keystone user-create \
keystone user-role-add \ --name "$DEMO_USER_NAME" \
--tenant "$DEMO_TENANT_NAME" \ --tenant "$DEMO_TENANT_NAME" \
--user "$DEMO_USER_NAME" \ --pass "$DEMO_PASSWORD" \
--role "$MEMBER_ROLE_NAME" --email "demo@$MAIL_DOMAIN"
echo "Adding service tenant." echo "Adding service tenant."
keystone tenant-create \ keystone tenant-create \