openstack/devstack
Code Issues Proposed changes

Merge "Stop referencing no longer existing SERVICE_ENDPOINT variable"

Browse Source
This commit is contained in:
Jenkins 2016-01-22 03:38:49 +00:00 committed by Gerrit Code Review
commit 2fec683890
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/swift
View File

@ -817,7 +817,6 @@ function swift_configure_tempurls {
OS_USERNAME=swift \ OS_USERNAME=swift \
OS_PASSWORD=$SERVICE_PASSWORD \ OS_PASSWORD=$SERVICE_PASSWORD \
OS_PROJECT_NAME=$SERVICE_TENANT_NAME \ OS_PROJECT_NAME=$SERVICE_TENANT_NAME \
OS_AUTH_URL=$SERVICE_ENDPOINT \
openstack object store account \ openstack object store account \
set --property "Temp-URL-Key=$SWIFT_TEMPURL_KEY" set --property "Temp-URL-Key=$SWIFT_TEMPURL_KEY"
} }

2
tools/create_userrc.sh
View File

@ -156,8 +156,6 @@ if [ -z "$MODE" ]; then
exit 3 exit 3
fi 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) EC2_URL=$(openstack endpoint list --service ec2 --interface public --os-identity-api-version=3 -c URL -f value || true)
if [[ -z $EC2_URL ]]; then if [[ -z $EC2_URL ]]; then
EC2_URL=http://localhost:8773/ EC2_URL=http://localhost:8773/