From 485c962667631e4f321ee2513729718305f4f372 Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Mon, 24 Aug 2015 22:55:19 +0300 Subject: [PATCH] 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 --- tools/create_userrc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/create_userrc.sh b/tools/create_userrc.sh index c2dbe1aeb4..de44abbbe5 100755 --- a/tools/create_userrc.sh +++ b/tools/create_userrc.sh @@ -158,12 +158,12 @@ fi export -n SERVICE_TOKEN SERVICE_ENDPOINT OS_SERVICE_TOKEN OS_SERVICE_ENDPOINT -EC2_URL=$(openstack endpoint show -f value -c publicurl ec2 || true) +EC2_URL=$(openstack endpoint list --service ec2 --interface public --os-identity-api-version=3 -c URL -f value || true) if [[ -z $EC2_URL ]]; then EC2_URL=http://localhost:8773/ fi -S3_URL=$(openstack endpoint show -f value -c publicurl s3 || true) +S3_URL=$(openstack endpoint list --service s3 --interface public --os-identity-api-version=3 -c URL -f value || true) if [[ -z $S3_URL ]]; then S3_URL=http://localhost:3333 fi