diff --git a/keystone/server/flask/application.py b/keystone/server/flask/application.py index ddde080cfa..ba8ca8360a 100644 --- a/keystone/server/flask/application.py +++ b/keystone/server/flask/application.py @@ -17,13 +17,7 @@ import flask import oslo_i18n from oslo_log import log from oslo_middleware import healthcheck - -try: - # werkzeug 0.15.x - from werkzeug.middleware import dispatcher as wsgi_dispatcher -except ImportError: - # werkzeug 0.14.x - import werkzeug.wsgi as wsgi_dispatcher +from werkzeug.middleware import dispatcher from keystone.api import auth from keystone.api import credentials @@ -238,7 +232,7 @@ def application_factory(name='public'): # Use the simple form of the dispatch middleware, no extra logic needed # for legacy dispatching. This is to mount /healthcheck at a consistent # place - app.wsgi_app = wsgi_dispatcher.DispatcherMiddleware( + app.wsgi_app = dispatcher.DispatcherMiddleware( app.wsgi_app, {'/healthcheck': hc_app} ) return app diff --git a/keystone/server/flask/core.py b/keystone/server/flask/core.py index 42d28468a8..f4fadb0580 100644 --- a/keystone/server/flask/core.py +++ b/keystone/server/flask/core.py @@ -15,13 +15,7 @@ import os from oslo_log import log import stevedore - -try: - # werkzeug 0.15.x - from werkzeug.middleware import proxy_fix -except ImportError: - # werkzeug 0.14.x - from werkzeug.contrib import fixers as proxy_fix +from werkzeug.middleware import proxy_fix from keystone.common import profiler import keystone.conf diff --git a/requirements.txt b/requirements.txt index 3b03fc21d4..aa980f262a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -37,3 +37,4 @@ jsonschema>=3.2.0 # MIT pycadf!=2.0.0,>=1.1.0 # Apache-2.0 msgpack>=0.5.0 # Apache-2.0 osprofiler>=1.4.0 # Apache-2.0 +Werkzeug>=0.15.0 # BSD License