diff options
| author | Everett Toews <everett.toews@gmail.com> | 2012-05-08 22:02:57 +0000 |
|---|---|---|
| committer | Everett Toews <everett.toews@gmail.com> | 2012-05-16 15:55:23 +0000 |
| commit | 2ee73cca0180976270f05ea46374e0fef38ff513 (patch) | |
| tree | 3ed125847b88ac406764fc690e26262a21cda386 /tools | |
| parent | 3c9c38a8e08dd0300a04edb843a0b3e49486e86f (diff) | |
| download | keystone-2ee73cca0180976270f05ea46374e0fef38ff513.tar.gz keystone-2ee73cca0180976270f05ea46374e0fef38ff513.tar.xz keystone-2ee73cca0180976270f05ea46374e0fef38ff513.zip | |
Changed arguments in keystone CLI for consistency.
Changed --user to --user_id and --role to --role_id in the keystone client for
consistency. Need to update keystone calls here.
This change should be applied after [bug/994744 b7fe11c] in
python-keystoneclient.
Fixes bug 994744.
Change-Id: I234c1d46c0d92a6a00ebb25c5dfbba69cd46be52
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/sample_data.sh | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/tools/sample_data.sh b/tools/sample_data.sh index 31b97055..3dda911d 100755 --- a/tools/sample_data.sh +++ b/tools/sample_data.sh @@ -120,16 +120,16 @@ NETADMIN_ROLE=$(get_id keystone role-create --name=netadmin) # 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 $DEMO_USER --role $MEMBER_ROLE --tenant_id $DEMO_TENANT -keystone user-role-add --user $DEMO_USER --role $SYSADMIN_ROLE --tenant_id $DEMO_TENANT -keystone user-role-add --user $DEMO_USER --role $NETADMIN_ROLE --tenant_id $DEMO_TENANT -keystone user-role-add --user $DEMO_USER --role $MEMBER_ROLE --tenant_id $INVIS_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 $ADMIN_TENANT +keystone user-role-add --user_id $DEMO_USER --role_id $MEMBER_ROLE --tenant_id $DEMO_TENANT +keystone user-role-add --user_id $DEMO_USER --role_id $SYSADMIN_ROLE --tenant_id $DEMO_TENANT +keystone user-role-add --user_id $DEMO_USER --role_id $NETADMIN_ROLE --tenant_id $DEMO_TENANT +keystone user-role-add --user_id $DEMO_USER --role_id $MEMBER_ROLE --tenant_id $INVIS_TENANT +keystone user-role-add --user_id $ADMIN_USER --role_id $ADMIN_ROLE --tenant_id $DEMO_TENANT # 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 $ADMIN_USER --role $KEYSTONESERVICE_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_id $ADMIN_USER --role_id $KEYSTONESERVICE_ROLE --tenant_id $ADMIN_TENANT # Services @@ -142,8 +142,8 @@ NOVA_USER=$(get_id keystone user-create --name=nova \ --tenant_id $SERVICE_TENANT \ --email=nova@example.com) keystone user-role-add --tenant_id $SERVICE_TENANT \ - --user $NOVA_USER \ - --role $ADMIN_ROLE + --user_id $NOVA_USER \ + --role_id $ADMIN_ROLE if [[ -n "$ENABLE_ENDPOINTS" ]]; then keystone endpoint-create --region RegionOne --service_id $NOVA_SERVICE \ --publicurl 'http://localhost:$(compute_port)s/v1.1/$(tenant_id)s' \ @@ -171,8 +171,8 @@ GLANCE_USER=$(get_id keystone user-create --name=glance \ --tenant_id $SERVICE_TENANT \ --email=glance@example.com) keystone user-role-add --tenant_id $SERVICE_TENANT \ - --user $GLANCE_USER \ - --role $ADMIN_ROLE + --user_id $GLANCE_USER \ + --role_id $ADMIN_ROLE if [[ -n "$ENABLE_ENDPOINTS" ]]; then keystone endpoint-create --region RegionOne --service_id $GLANCE_SERVICE \ --publicurl http://localhost:9292/v1 \ @@ -215,8 +215,8 @@ if [[ -n "$ENABLE_SWIFT" ]]; then --tenant_id $SERVICE_TENANT \ --email=swift@example.com) keystone user-role-add --tenant_id $SERVICE_TENANT \ - --user $SWIFT_USER \ - --role $ADMIN_ROLE + --user_id $SWIFT_USER \ + --role_id $ADMIN_ROLE fi if [[ -n "$ENABLE_QUANTUM" ]]; then @@ -228,17 +228,17 @@ if [[ -n "$ENABLE_QUANTUM" ]]; then --tenant_id $SERVICE_TENANT \ --email=quantum@example.com) keystone user-role-add --tenant_id $SERVICE_TENANT \ - --user $QUANTUM_USER \ - --role $ADMIN_ROLE + --user_id $QUANTUM_USER \ + --role_id $ADMIN_ROLE fi # create ec2 creds and parse the secret and access key returned -RESULT=$(keystone ec2-credentials-create --tenant_id=$ADMIN_TENANT --user=$ADMIN_USER) +RESULT=$(keystone ec2-credentials-create --tenant_id=$ADMIN_TENANT --user_id=$ADMIN_USER) ADMIN_ACCESS=`echo "$RESULT" | grep access | awk '{print $4}'` ADMIN_SECRET=`echo "$RESULT" | grep secret | awk '{print $4}'` -RESULT=$(keystone ec2-credentials-create --tenant_id=$DEMO_TENANT --user=$DEMO_USER) +RESULT=$(keystone ec2-credentials-create --tenant_id=$DEMO_TENANT --user_id=$DEMO_USER) DEMO_ACCESS=`echo "$RESULT" | grep access | awk '{print $4}'` DEMO_SECRET=`echo "$RESULT" | grep secret | awk '{print $4}'` |