commit 050a0d5b304a013e23cd5909abf6e11b7dda5f18
author Steve Martinelli <stevemar@ca.ibm.com> Sun Sep 06 22:03:54 2015 +0000
committer Jamie Lennox <jamielennox@redhat.com> Tue Sep 29 19:52:28 2015 +0000
tree 5d3dcb78f29469d8fee79ca9d235398326fd5f14
parent d2999d0d0cc4d283873ff0d0951c4fdacd234dd1

Revert "Revert "Convert identity defaults to keystone v3 api""

This reverts commit f768787bdd6dddf2790f83a884618d29677ca77c.
And sets OS_AUTH_VERSION so swift CLI doesn't fall flat when
not using v2 keystone

Change-Id: If44a7e0d85e48020a3c90d8c5c027513129f0f3b

lib/swift

diff --git a/lib/swift b/lib/swift
index 645bfd7..f0eb56a 100644
--- a/lib/swift
+++ b/lib/swift
@@ -799,10 +799,10 @@
 
 function swift_configure_tempurls {
     OS_USERNAME=swift \
-        OS_TENANT_NAME=$SERVICE_TENANT_NAME \
+        OS_PROJECT_NAME=$SERVICE_TENANT_NAME \
         OS_PASSWORD=$SERVICE_PASSWORD \
-        OS_AUTH_URL=$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION \
-        swift post -m "Temp-URL-Key: $SWIFT_TEMPURL_KEY"
+        OS_AUTH_URL=$SERVICE_ENDPOINT \
+        swift post --auth-version 3 -m "Temp-URL-Key: $SWIFT_TEMPURL_KEY"
 }
 
 # Restore xtrace