Merge "Stop referencing no longer existing SERVICE_ENDPOINT variable"
This commit is contained in:
commit
2fec683890
@ -817,7 +817,6 @@ function swift_configure_tempurls {
|
||||
OS_USERNAME=swift \
|
||||
OS_PASSWORD=$SERVICE_PASSWORD \
|
||||
OS_PROJECT_NAME=$SERVICE_TENANT_NAME \
|
||||
OS_AUTH_URL=$SERVICE_ENDPOINT \
|
||||
openstack object store account \
|
||||
set --property "Temp-URL-Key=$SWIFT_TEMPURL_KEY"
|
||||
}
|
||||
|
@ -156,8 +156,6 @@ if [ -z "$MODE" ]; then
|
||||
exit 3
|
||||
fi
|
||||
|
||||
export -n SERVICE_ENDPOINT OS_SERVICE_ENDPOINT
|
||||
|
||||
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/
|
||||
|
Loading…
Reference in New Issue
Block a user