commit | 0a8b3222a8858ad7d4a2e092f83997f059b850c6 | [log] [tgz] |
---|---|---|
author | Eoghan Glynn <eglynn@redhat.com> | Mon Mar 05 13:15:56 2012 +0000 |
committer | Eoghan Glynn <eglynn@redhat.com> | Mon Mar 05 13:15:56 2012 +0000 |
tree | 1a1e5b06cb56859498932965cf1ead38c015f0fa | |
parent | f82f7daa1423a923213f2d1ac336d4e01d9470e0 [diff] [blame] |
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
diff --git a/tools/configure_tempest.sh b/tools/configure_tempest.sh index f6ef0d3..9b25b7e 100755 --- a/tools/configure_tempest.sh +++ b/tools/configure_tempest.sh
@@ -133,7 +133,7 @@ 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|;