Browse code
Fix create_userrc.sh script
Patchset fixes calculating EC2_URL/S3_URL for user rc files in 'accrc' directory.
Currently calculation of these url's uses 'openstack endpoint show' command
without specifying os-identity-v3 flag. But output is empty without such flag.
So this patchset uses same construction as exists in functions-common.
Change-Id: Ia4f2510750fa0f46e2f1d58cf0a7a16782f022b3
Andrey Pavlov authored on 2015/08/25 04:55:19Showing 1 changed files
| ... | ... |
@@ -158,12 +158,12 @@ fi |
| 158 | 158 |
|
| 159 | 159 |
export -n SERVICE_TOKEN SERVICE_ENDPOINT OS_SERVICE_TOKEN OS_SERVICE_ENDPOINT |
| 160 | 160 |
|
| 161 |
-EC2_URL=$(openstack endpoint show -f value -c publicurl ec2 || true) |
|
| 161 |
+EC2_URL=$(openstack endpoint list --service ec2 --interface public --os-identity-api-version=3 -c URL -f value || true) |
|
| 162 | 162 |
if [[ -z $EC2_URL ]]; then |
| 163 | 163 |
EC2_URL=http://localhost:8773/ |
| 164 | 164 |
fi |
| 165 | 165 |
|
| 166 |
-S3_URL=$(openstack endpoint show -f value -c publicurl s3 || true) |
|
| 166 |
+S3_URL=$(openstack endpoint list --service s3 --interface public --os-identity-api-version=3 -c URL -f value || true) |
|
| 167 | 167 |
if [[ -z $S3_URL ]]; then |
| 168 | 168 |
S3_URL=http://localhost:3333 |
| 169 | 169 |
fi |