From 0a8b3222a8858ad7d4a2e092f83997f059b850c6 Mon Sep 17 00:00:00 2001
From: Eoghan Glynn <eglynn@redhat.com>
Date: Mon, 5 Mar 2012 13:15:56 +0000
Subject: [PATCH] Avoid duplicate "/tokens" path in auth_url.

The "/tokens" path is explicitly appended to the OS_AUTH_URL
by the configure_tempest.sh tool, but this is also appended
internally by glance:

  https://github.com/openstack/glance/blob/master/glance/common/auth.py#L111

leading to a duplicated "/tokens/tokens" path.

Change-Id: I2ea49289f7e1976346eff220dc3d1664bdad4fb0
---
 tools/configure_tempest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/configure_tempest.sh b/tools/configure_tempest.sh
index f6ef0d3b95..9b25b7e8b6 100755
--- a/tools/configure_tempest.sh
+++ b/tools/configure_tempest.sh
@@ -133,7 +133,7 @@ fi
 
 sed -e "
     /^api_key=/s|=.*\$|=$ADMIN_PASSWORD|;
-    /^auth_url=/s|=.*\$|=${OS_AUTH_URL%/}/tokens/|;
+    /^auth_url=/s|=.*\$|=${OS_AUTH_URL%/}/|;
     /^host=/s|=.*\$|=$HOST_IP|;
     /^image_ref=/s|=.*\$|=$IMAGE_UUID|;
     /^password=/s|=.*\$|=$ADMIN_PASSWORD|;