From: Lenz Grimmer <lenz@grimmer.com>
Date: Tue, 16 Apr 2019 12:39:05 +0000 (+0200)
Subject: Merge pull request #27036 from votdev/issue_24453
X-Git-Tag: v15.1.0~2927
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=17c59e3d8bc8101c2afb6bae37036571d15fd54d;p=ceph.git

Merge pull request #27036 from votdev/issue_24453

mgr/dashboard: Manager should complain about wrong dashboard certificate

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
---

17c59e3d8bc8101c2afb6bae37036571d15fd54d
diff --cc src/pybind/mgr/dashboard/module.py
index a8a3ec07c1ca,45d41d5e3a03..71760d7f0f5f
--- a/src/pybind/mgr/dashboard/module.py
+++ b/src/pybind/mgr/dashboard/module.py
@@@ -13,9 -13,11 +13,9 @@@ import tempfil
  import threading
  import time
  from uuid import uuid4
- from OpenSSL import crypto
+ from OpenSSL import crypto, SSL
  from mgr_module import MgrModule, MgrStandbyModule, Option
  
 -from .tools import str_to_bool
 -
  try:
      import cherrypy
      from cherrypy._cptools import HandlerWrapperTool