From 035b3a8b33d888b1d26662075f78d5f0fb14ed17 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Tue, 18 Sep 2018 09:33:22 +0200 Subject: [PATCH] mgr/dashboard: Rename SSLCherryPyConfig The class does not always set up SSL, dropping the SSL bit. Fixes: http://tracker.ceph.com/issues/36069 Signed-off-by: Boris Ranto --- src/pybind/mgr/dashboard/module.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py index 5d8799ea68f56..08c5eda6878f9 100644 --- a/src/pybind/mgr/dashboard/module.py +++ b/src/pybind/mgr/dashboard/module.py @@ -91,7 +91,7 @@ class ServerConfigException(Exception): pass -class SSLCherryPyConfig(object): +class CherryPyConfig(object): """ Class for common server configuration done by both active and standby module, especially setting up SSL. @@ -213,7 +213,7 @@ class SSLCherryPyConfig(object): return uri -class Module(MgrModule, SSLCherryPyConfig): +class Module(MgrModule, CherryPyConfig): """ dashboard module entrypoint """ @@ -249,7 +249,7 @@ class Module(MgrModule, SSLCherryPyConfig): def __init__(self, *args, **kwargs): super(Module, self).__init__(*args, **kwargs) - SSLCherryPyConfig.__init__(self) + CherryPyConfig.__init__(self) mgr.init(self) @@ -317,7 +317,7 @@ class Module(MgrModule, SSLCherryPyConfig): def shutdown(self): super(Module, self).shutdown() - SSLCherryPyConfig.shutdown(self) + CherryPyConfig.shutdown(self) logger.info('Stopping engine...') self.shutdown_event.set() @@ -364,10 +364,10 @@ class Module(MgrModule, SSLCherryPyConfig): NotificationQueue.new_notification(notify_type, notify_id) -class StandbyModule(MgrStandbyModule, SSLCherryPyConfig): +class StandbyModule(MgrStandbyModule, CherryPyConfig): def __init__(self, *args, **kwargs): super(StandbyModule, self).__init__(*args, **kwargs) - SSLCherryPyConfig.__init__(self) + CherryPyConfig.__init__(self) self.shutdown_event = threading.Event() # We can set the global mgr instance to ourselves even though @@ -419,7 +419,7 @@ class StandbyModule(MgrStandbyModule, SSLCherryPyConfig): self.log.info("Engine stopped.") def shutdown(self): - SSLCherryPyConfig.shutdown(self) + CherryPyConfig.shutdown(self) self.log.info("Stopping engine...") self.shutdown_event.set() -- 2.39.5