GitList

Browse code

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

Eoghan Glynn authored on 2012/03/05 22:15:56
Showing 1 changed files

tools/configure_tempest.sh index f6ef0d3..9b25b7e 100755

tools/configure_tempest.sh

History View file @ 0a8b322

@@ -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|;