Version Discovery Hack causing unexpected catalog endpoint results

[Morgan Fainberg]

The code provided for bug 1335726 appears to have broken the keystonemiddleware tests and is resulting in a v2.0 endpoint being returned when a v3 endpoint is being requested.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/123021

[OpenStack Infra (hudson-openstack)]

Change abandoned by Morgan Fainberg (<email address hidden>) on branch: master
Review: https://review.openstack.org/123019
Reason: Fixed by https://review.openstack.org/#/c/123021/

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/123021
Committed: https://git.openstack.org/cgit/openstack/keystonemiddleware/commit/?id=1f8b4fe4432c7725ed3ac630ab07990ff9a48d17
Submitter: Jenkins
Branch: master

commit 1f8b4fe4432c7725ed3ac630ab07990ff9a48d17
Author: Brant Knudson <email address hidden>
Date: Sun Sep 21 17:22:04 2014 -0500

    Fix test failure after discovery hack

    With the discovery hack, the test_auth_plugin is now trying to
    query the unversioned endpoint from the catalog to discover what
    versions it supports. Since that URL wasn't stubbed out with
    httpretty it was causing a failure and then a different URL than
    expected was returned by the plugin.

    This change registers the discovery URL that's in the test token
    so that fetching it doesn't fail but returns a normal version
    response.

    Related-Bug: #1335726
    Closes-Bug: #1372190
    Change-Id: I1ae41801ed44ec6a37d972f62fc853dfd609128f