From 656f7cd9b40edbdc6b6024e0b3c15c7fa137e8a0 Mon Sep 17 00:00:00 2001 From: Avan Thakkar Date: Wed, 17 Feb 2021 03:55:29 +0530 Subject: [PATCH] mgr/dashboard: fix dashboard instance ssl certificate functionality Fixes: https://tracker.ceph.com/issues/46542 Signed-off-by: Avan Thakkar (cherry picked from commit 0a88c62e76f80a4ad9c01a91161b77ac6f073ed4) Conflicts: src/pybind/mgr/dashboard/module.py src/pybind/mgr/mgr_module.py - Adopting required master branch changes. --- src/pybind/mgr/dashboard/module.py | 4 ++-- src/pybind/mgr/mgr_module.py | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py index 9770bd85652f5..224b05cab2248 100644 --- a/src/pybind/mgr/dashboard/module.py +++ b/src/pybind/mgr/dashboard/module.py @@ -152,7 +152,7 @@ class CherryPyConfig(object): if use_ssl: # SSL initialization - cert = self.get_store("crt") + cert = self.get_localized_store("crt") if cert is not None: self.cert_tmp = tempfile.NamedTemporaryFile() self.cert_tmp.write(cert.encode('utf-8')) @@ -161,7 +161,7 @@ class CherryPyConfig(object): else: cert_fname = self.get_localized_module_option('crt_file') - pkey = self.get_store("key") + pkey = self.get_localized_store("key") if pkey is not None: self.pkey_tmp = tempfile.NamedTemporaryFile() self.pkey_tmp.write(pkey.encode('utf-8')) diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py index 79cbc95036e32..07d590fafa22e 100644 --- a/src/pybind/mgr/mgr_module.py +++ b/src/pybind/mgr/mgr_module.py @@ -556,6 +556,14 @@ class MgrStandbyModule(ceph_module.BaseMgrStandbyModule): """ return self._ceph_get_store(key) + def get_localized_store(self, key, default=None): + r = self._ceph_get_store(_get_localized_key(self.get_mgr_id(), key)) + if r is None: + r = self._ceph_get_store(key) + if r is None: + r = default + return r + def get_active_uri(self): return self._ceph_get_active_uri() -- 2.39.5