openstack
/
nova
Code Issues Proposed changes

trivial: Bump minimum version of websockify 

This includes a couple of fixes and removes the need for custom
workarounds, like the removal of the 'address_string' helper at [1].

[1] https://github.com/novnc/websockify/commit/be9823bf

Change-Id: I9b1d57fd513386e552afbbc8a59cf3a4c54b6908
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
Stephen Finucane 2019-12-16 11:11:37 +00:00
parent 14fed95f61
commit 082dc59b89
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lower-constraints.txt
View File

@ -165,7 +165,7 @@ vine==1.1.4
voluptuous==0.11.1
warlock==1.2.0
WebOb==1.8.2
websockify==0.8.0
websockify==0.9.0
wrapt==1.10.11
wsgi-intercept==1.7.0
zVMCloudConnector==1.3.0

16
nova/console/websocketproxy.py
View File

@ -94,11 +94,6 @@ class TenantSock(object):
class NovaProxyRequestHandlerBase(object):
def address_string(self):
# NOTE(rpodolyaka): override the superclass implementation here and
# explicitly disable the reverse DNS lookup, which might fail on some
# deployments due to DNS configuration and break VNC access completely
return str(self.client_address[0])
def verify_origin_proto(self, connect_info, origin_proto):
if 'access_url_base' not in connect_info:
@ -294,16 +289,7 @@ class NovaProxyRequestHandler(NovaProxyRequestHandlerBase,
return self._compute_rpcapi
def socket(self, *args, **kwargs):
# TODO(melwitt): The try_import and if-else condition can be removed
# when we get to the point where we're requiring at least websockify
# v.0.9.0 in our lower-constraints.
if websockifyserver is not None:
# In websockify v0.9.0, the 'socket' method moved to the
# websockify.websockifyserver.WebSockifyServer class.
return websockifyserver.WebSockifyServer.socket(*args, **kwargs)
else:
# Fall back to the websockify <= v0.8.0 'socket' method location.
return websockify.WebSocketServer.socket(*args, **kwargs)
return websockifyserver.WebSockifyServer.socket(*args, **kwargs)
class NovaWebSocketProxy(websockify.WebSocketProxy):

2
requirements.txt
View File

@ -32,7 +32,7 @@ python-glanceclient>=2.8.0 # Apache-2.0
requests>=2.14.2 # Apache-2.0
six>=1.10.0 # MIT
stevedore>=1.20.0 # Apache-2.0
websockify>=0.8.0 # LGPLv3
websockify>=0.9.0 # LGPLv3
oslo.cache>=1.26.0 # Apache-2.0
oslo.concurrency>=3.26.0 # Apache-2.0
oslo.config>=6.1.0 # Apache-2.0