diff options
| -rw-r--r-- | lower-constraints.txt | 4 | ||||
| -rw-r--r-- | neutron/tests/unit/test_wsgi.py | 3 | ||||
| -rw-r--r-- | neutron/wsgi.py | 3 | ||||
| -rw-r--r-- | requirements.txt | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/lower-constraints.txt b/lower-constraints.txt index 4a9c97e620..15ce33a69f 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -27,7 +27,7 @@ future==0.16.0 futurist==1.2.0 gitdb==0.6.4 GitPython==1.0.1 -greenlet==0.4.14 +greenlet==0.4.16 httplib2==0.9.1 imagesize==0.7.1 iso8601==0.1.11 @@ -72,7 +72,7 @@ oslo.privsep==2.3.0 oslo.reports==1.18.0 oslo.rootwrap==5.15.0 oslo.serialization==2.25.0 -oslo.service==1.31.0 +oslo.service==2.8.0 oslo.upgradecheck==1.3.0 oslo.utils==4.8.0 oslo.versionedobjects==1.35.1 diff --git a/neutron/tests/unit/test_wsgi.py b/neutron/tests/unit/test_wsgi.py index c107c80639..1f5ecfe1c1 100644 --- a/neutron/tests/unit/test_wsgi.py +++ b/neutron/tests/unit/test_wsgi.py @@ -210,7 +210,8 @@ class TestWSGIServer(base.BaseTestCase): log=mock.ANY, keepalive=CONF.wsgi_keep_alive, log_format=CONF.wsgi_log_format, - socket_timeout=server.client_socket_timeout + socket_timeout=server.client_socket_timeout, + debug=False, ) diff --git a/neutron/wsgi.py b/neutron/wsgi.py index 619d11a1ef..9c07bda478 100644 --- a/neutron/wsgi.py +++ b/neutron/wsgi.py @@ -225,7 +225,8 @@ class Server(object): log=LOG, keepalive=CONF.wsgi_keep_alive, log_format=CONF.wsgi_log_format, - socket_timeout=self.client_socket_timeout) + socket_timeout=self.client_socket_timeout, + debug=CONF.wsgi_server_debug) @property def process_launcher(self): diff --git a/requirements.txt b/requirements.txt index 117fbe4528..32ce19c095 100644 --- a/requirements.txt +++ b/requirements.txt @@ -38,7 +38,7 @@ oslo.privsep>=2.3.0 # Apache-2.0 oslo.reports>=1.18.0 # Apache-2.0 oslo.rootwrap>=5.15.0 # Apache-2.0 oslo.serialization>=2.25.0 # Apache-2.0 -oslo.service>=1.31.0 # Apache-2.0 +oslo.service>=2.8.0 # Apache-2.0 oslo.upgradecheck>=1.3.0 # Apache-2.0 oslo.utils>=4.8.0 # Apache-2.0 oslo.versionedobjects>=1.35.1 # Apache-2.0 |