]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #27036 from votdev/issue_24453
authorLenz Grimmer <lenz@grimmer.com>
Tue, 16 Apr 2019 12:39:05 +0000 (14:39 +0200)
committerGitHub <noreply@github.com>
Tue, 16 Apr 2019 12:39:05 +0000 (14:39 +0200)
mgr/dashboard: Manager should complain about wrong dashboard certificate

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
1  2 
src/pybind/mgr/dashboard/module.py

index a8a3ec07c1ca203cbf103d91c3765749c4f6f378,45d41d5e3a03fa8f02928239716d773f8329020a..71760d7f0f5f6f0167f33677acd20bb9a664aeb6
@@@ -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