From f90c0b7d29abe58d7d10608599e6399cf6adc509 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Mon, 18 Jan 2016 10:52:59 +0100 Subject: [PATCH] Stop referencing no longer existing SERVICE_ENDPOINT variable It was probably finally removed by one of recent refactoring changes. Now ironic gate fails due to Swift trying to access it to override OS_AUTH_URL. This change drops this override and just uses OS_AUTH_URL. Closes-Bug: #1535245 Change-Id: I145bec110c4299e61f2bce49df41dcd82e5d462d --- lib/swift | 1 - tools/create_userrc.sh | 2 -- 2 files changed, 3 deletions(-) diff --git a/lib/swift b/lib/swift index b596142ad2..9edeb0ab79 100644 --- a/lib/swift +++ b/lib/swift @@ -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" } diff --git a/tools/create_userrc.sh b/tools/create_userrc.sh index 93d5d69342..74d5428382 100755 --- a/tools/create_userrc.sh +++ b/tools/create_userrc.sh @@ -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/