diff options
| author | Brant Knudson <bknudson@us.ibm.com> | 2014-09-02 15:02:15 -0500 |
|---|---|---|
| committer | Brant Knudson <bknudson@us.ibm.com> | 2014-09-10 16:49:21 -0500 |
| commit | 0b676730347c76c7f64a67c1ad0135663e99c4fc (patch) | |
| tree | 1056854abecf00958471ef882fe385cbc1311b18 /httpd | |
| parent | 12655bf17276ace37ea27e8b981a1a53d1572781 (diff) | |
| download | keystone-0b676730347c76c7f64a67c1ad0135663e99c4fc.tar.gz | |
Add V3 JSON Home support to GET /
The server wasn't returning a JSON Home response for GET / when the
Accept header is `application/json-home`. By returning the V3 JSON
Home response for GET / a V3 client that supports JSON Home can
GET either /v3 or / and use the response. The identity API should
be able to be set to /.
Closes-Bug: #1366589
Change-Id: I3191a85acf9d2f582f6b48a164cf5ac2bf84a8cf
Diffstat (limited to 'httpd')
| -rw-r--r-- | httpd/keystone.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/httpd/keystone.py b/httpd/keystone.py index ca658959d..f5ce498c5 100644 --- a/httpd/keystone.py +++ b/httpd/keystone.py @@ -16,7 +16,6 @@ import logging import os from oslo import i18n -from paste import deploy # NOTE(dstanek): i18n.enable_lazy() must be called before @@ -32,6 +31,7 @@ from keystone.common import environment from keystone.common import sql from keystone import config from keystone.openstack.common import log +from keystone import service CONF = config.CONF @@ -55,7 +55,6 @@ drivers = backends.load_backends() # NOTE(ldbragst): 'application' is required in this context by WSGI spec. # The following is a reference to Python Paste Deploy documentation # http://pythonpaste.org/deploy/ -application = deploy.loadapp('config:%s' % config.find_paste_config(), - name=name) +application = service.loadapp('config:%s' % config.find_paste_config(), name) dependency.resolve_future_dependencies() |