Browse code

Merge "Stop referencing no longer existing SERVICE_ENDPOINT variable"

Jenkins authored on 2016/01/22 12:38:49
Showing 2 changed files
... ...
@@ -817,7 +817,6 @@ function swift_configure_tempurls {
817 817
     OS_USERNAME=swift \
818 818
     OS_PASSWORD=$SERVICE_PASSWORD \
819 819
     OS_PROJECT_NAME=$SERVICE_TENANT_NAME \
820
-    OS_AUTH_URL=$SERVICE_ENDPOINT \
821 820
     openstack object store account \
822 821
         set --property "Temp-URL-Key=$SWIFT_TEMPURL_KEY"
823 822
 }
... ...
@@ -156,8 +156,6 @@ if [ -z "$MODE" ]; then
156 156
     exit 3
157 157
 fi
158 158
 
159
-export -n SERVICE_ENDPOINT OS_SERVICE_ENDPOINT
160
-
161 159
 EC2_URL=$(openstack endpoint list --service ec2 --interface public --os-identity-api-version=3 -c URL -f value || true)
162 160
 if [[ -z $EC2_URL ]]; then
163 161
     EC2_URL=http://localhost:8773/