Browse code
Merge "remove unused splats"
Jenkins authored on 2011/12/24 05:30:44Showing 1 changed files
| ... | ... |
@@ -1,54 +1,54 @@ |
| 1 | 1 |
#!/bin/bash |
| 2 | 2 |
BIN_DIR=${BIN_DIR:-.}
|
| 3 | 3 |
# Tenants |
| 4 |
-$BIN_DIR/keystone-manage $* tenant add admin |
|
| 5 |
-$BIN_DIR/keystone-manage $* tenant add demo |
|
| 6 |
-$BIN_DIR/keystone-manage $* tenant add invisible_to_admin |
|
| 4 |
+$BIN_DIR/keystone-manage tenant add admin |
|
| 5 |
+$BIN_DIR/keystone-manage tenant add demo |
|
| 6 |
+$BIN_DIR/keystone-manage tenant add invisible_to_admin |
|
| 7 | 7 |
|
| 8 | 8 |
# Users |
| 9 |
-$BIN_DIR/keystone-manage $* user add admin %ADMIN_PASSWORD% |
|
| 10 |
-$BIN_DIR/keystone-manage $* user add demo %ADMIN_PASSWORD% |
|
| 9 |
+$BIN_DIR/keystone-manage user add admin %ADMIN_PASSWORD% |
|
| 10 |
+$BIN_DIR/keystone-manage user add demo %ADMIN_PASSWORD% |
|
| 11 | 11 |
|
| 12 | 12 |
# Roles |
| 13 |
-$BIN_DIR/keystone-manage $* role add Admin |
|
| 14 |
-$BIN_DIR/keystone-manage $* role add Member |
|
| 15 |
-$BIN_DIR/keystone-manage $* role add KeystoneAdmin |
|
| 16 |
-$BIN_DIR/keystone-manage $* role add KeystoneServiceAdmin |
|
| 17 |
-$BIN_DIR/keystone-manage $* role add sysadmin |
|
| 18 |
-$BIN_DIR/keystone-manage $* role add netadmin |
|
| 19 |
-$BIN_DIR/keystone-manage $* role grant Admin admin admin |
|
| 20 |
-$BIN_DIR/keystone-manage $* role grant Member demo demo |
|
| 21 |
-$BIN_DIR/keystone-manage $* role grant sysadmin demo demo |
|
| 22 |
-$BIN_DIR/keystone-manage $* role grant netadmin demo demo |
|
| 23 |
-$BIN_DIR/keystone-manage $* role grant Member demo invisible_to_admin |
|
| 24 |
-$BIN_DIR/keystone-manage $* role grant Admin admin demo |
|
| 25 |
-$BIN_DIR/keystone-manage $* role grant Admin admin |
|
| 26 |
-$BIN_DIR/keystone-manage $* role grant KeystoneAdmin admin |
|
| 27 |
-$BIN_DIR/keystone-manage $* role grant KeystoneServiceAdmin admin |
|
| 13 |
+$BIN_DIR/keystone-manage role add Admin |
|
| 14 |
+$BIN_DIR/keystone-manage role add Member |
|
| 15 |
+$BIN_DIR/keystone-manage role add KeystoneAdmin |
|
| 16 |
+$BIN_DIR/keystone-manage role add KeystoneServiceAdmin |
|
| 17 |
+$BIN_DIR/keystone-manage role add sysadmin |
|
| 18 |
+$BIN_DIR/keystone-manage role add netadmin |
|
| 19 |
+$BIN_DIR/keystone-manage role grant Admin admin admin |
|
| 20 |
+$BIN_DIR/keystone-manage role grant Member demo demo |
|
| 21 |
+$BIN_DIR/keystone-manage role grant sysadmin demo demo |
|
| 22 |
+$BIN_DIR/keystone-manage role grant netadmin demo demo |
|
| 23 |
+$BIN_DIR/keystone-manage role grant Member demo invisible_to_admin |
|
| 24 |
+$BIN_DIR/keystone-manage role grant Admin admin demo |
|
| 25 |
+$BIN_DIR/keystone-manage role grant Admin admin |
|
| 26 |
+$BIN_DIR/keystone-manage role grant KeystoneAdmin admin |
|
| 27 |
+$BIN_DIR/keystone-manage role grant KeystoneServiceAdmin admin |
|
| 28 | 28 |
|
| 29 | 29 |
# Services |
| 30 |
-$BIN_DIR/keystone-manage $* service add nova compute "Nova Compute Service" |
|
| 31 |
-$BIN_DIR/keystone-manage $* service add ec2 ec2 "EC2 Compatability Layer" |
|
| 32 |
-$BIN_DIR/keystone-manage $* service add glance image "Glance Image Service" |
|
| 33 |
-$BIN_DIR/keystone-manage $* service add keystone identity "Keystone Identity Service" |
|
| 30 |
+$BIN_DIR/keystone-manage service add nova compute "Nova Compute Service" |
|
| 31 |
+$BIN_DIR/keystone-manage service add ec2 ec2 "EC2 Compatability Layer" |
|
| 32 |
+$BIN_DIR/keystone-manage service add glance image "Glance Image Service" |
|
| 33 |
+$BIN_DIR/keystone-manage service add keystone identity "Keystone Identity Service" |
|
| 34 | 34 |
if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then |
| 35 |
- $BIN_DIR/keystone-manage $* service add swift object-store "Swift Service" |
|
| 35 |
+ $BIN_DIR/keystone-manage service add swift object-store "Swift Service" |
|
| 36 | 36 |
fi |
| 37 | 37 |
|
| 38 | 38 |
#endpointTemplates |
| 39 |
-$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne nova http://%HOST_IP%:8774/v1.1/%tenant_id% http://%HOST_IP%:8774/v1.1/%tenant_id% http://%HOST_IP%:8774/v1.1/%tenant_id% 1 1 |
|
| 40 |
-$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne ec2 http://%HOST_IP%:8773/services/Cloud http://%HOST_IP%:8773/services/Admin http://%HOST_IP%:8773/services/Cloud 1 1 |
|
| 41 |
-$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne glance http://%HOST_IP%:9292/v1.1/%tenant_id% http://%HOST_IP%:9292/v1.1/%tenant_id% http://%HOST_IP%:9292/v1.1/%tenant_id% 1 1 |
|
| 42 |
-$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne keystone http://%HOST_IP%:5000/v2.0 http://%HOST_IP%:35357/v2.0 http://%HOST_IP%:5000/v2.0 1 1 |
|
| 39 |
+$BIN_DIR/keystone-manage endpointTemplates add RegionOne nova http://%HOST_IP%:8774/v1.1/%tenant_id% http://%HOST_IP%:8774/v1.1/%tenant_id% http://%HOST_IP%:8774/v1.1/%tenant_id% 1 1 |
|
| 40 |
+$BIN_DIR/keystone-manage endpointTemplates add RegionOne ec2 http://%HOST_IP%:8773/services/Cloud http://%HOST_IP%:8773/services/Admin http://%HOST_IP%:8773/services/Cloud 1 1 |
|
| 41 |
+$BIN_DIR/keystone-manage endpointTemplates add RegionOne glance http://%HOST_IP%:9292/v1.1/%tenant_id% http://%HOST_IP%:9292/v1.1/%tenant_id% http://%HOST_IP%:9292/v1.1/%tenant_id% 1 1 |
|
| 42 |
+$BIN_DIR/keystone-manage endpointTemplates add RegionOne keystone http://%HOST_IP%:5000/v2.0 http://%HOST_IP%:35357/v2.0 http://%HOST_IP%:5000/v2.0 1 1 |
|
| 43 | 43 |
if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then |
| 44 |
- $BIN_DIR/keystone-manage $* endpointTemplates add RegionOne swift http://%HOST_IP%:8080/v1/AUTH_%tenant_id% http://%HOST_IP%:8080/ http://%HOST_IP%:8080/v1/AUTH_%tenant_id% 1 1 |
|
| 44 |
+ $BIN_DIR/keystone-manage endpointTemplates add RegionOne swift http://%HOST_IP%:8080/v1/AUTH_%tenant_id% http://%HOST_IP%:8080/ http://%HOST_IP%:8080/v1/AUTH_%tenant_id% 1 1 |
|
| 45 | 45 |
fi |
| 46 | 46 |
|
| 47 | 47 |
# Tokens |
| 48 |
-$BIN_DIR/keystone-manage $* token add %SERVICE_TOKEN% admin admin 2015-02-05T00:00 |
|
| 48 |
+$BIN_DIR/keystone-manage token add %SERVICE_TOKEN% admin admin 2015-02-05T00:00 |
|
| 49 | 49 |
|
| 50 | 50 |
# EC2 related creds - note we are setting the secret key to ADMIN_PASSWORD |
| 51 | 51 |
# but keystone doesn't parse them - it is just a blob from keystone's |
| 52 | 52 |
# point of view |
| 53 |
-$BIN_DIR/keystone-manage $* credentials add admin EC2 'admin' '%ADMIN_PASSWORD%' admin || echo "no support for adding credentials" |
|
| 54 |
-$BIN_DIR/keystone-manage $* credentials add demo EC2 'demo' '%ADMIN_PASSWORD%' demo || echo "no support for adding credentials" |
|
| 53 |
+$BIN_DIR/keystone-manage credentials add admin EC2 'admin' '%ADMIN_PASSWORD%' admin || echo "no support for adding credentials" |
|
| 54 |
+$BIN_DIR/keystone-manage credentials add demo EC2 'demo' '%ADMIN_PASSWORD%' demo || echo "no support for adding credentials" |