Merge "Avoid duplicate "/tokens" path in auth_url."

This commit is contained in:
Jenkins 2012-03-06 18:12:26 +00:00 committed by Gerrit Code Review
commit 5c4e9740df

View File

@ -133,7 +133,7 @@ fi
sed -e " sed -e "
/^api_key=/s|=.*\$|=$ADMIN_PASSWORD|; /^api_key=/s|=.*\$|=$ADMIN_PASSWORD|;
/^auth_url=/s|=.*\$|=${OS_AUTH_URL%/}/tokens/|; /^auth_url=/s|=.*\$|=${OS_AUTH_URL%/}/|;
/^host=/s|=.*\$|=$HOST_IP|; /^host=/s|=.*\$|=$HOST_IP|;
/^image_ref=/s|=.*\$|=$IMAGE_UUID|; /^image_ref=/s|=.*\$|=$IMAGE_UUID|;
/^password=/s|=.*\$|=$ADMIN_PASSWORD|; /^password=/s|=.*\$|=$ADMIN_PASSWORD|;