From 0254e5da7d0a37a2a73eba6c395997dc5640b047 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 9 Nov 2024 10:47:17 +0900 Subject: [PATCH] Drop remaining logic for websockify < 0.9.0 The minimum version of websockify was already bumped to 0.9.0 by [1]. [1] 082dc59b891b0e231bc82cb88a4b17646adbfac3 Change-Id: I836301599e8be67ea0a6b51e6f78bbbea71c0433 --- nova/console/websocketproxy.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nova/console/websocketproxy.py b/nova/console/websocketproxy.py index 961d106cfce8..f71b9e1ebbec 100644 --- a/nova/console/websocketproxy.py +++ b/nova/console/websocketproxy.py @@ -27,8 +27,8 @@ from urllib import parse as urlparse from oslo_log import log as logging from oslo_utils import encodeutils -from oslo_utils import importutils import websockify +from websockify import websockifyserver from nova.compute import rpcapi as compute_rpcapi import nova.conf @@ -40,9 +40,6 @@ from nova import objects from oslo_utils import timeutils import threading -# Location of WebSockifyServer class in websockify v0.9.0 -websockifyserver = importutils.try_import('websockify.websockifyserver') - LOG = logging.getLogger(__name__) CONF = nova.conf.CONF