Skip to content

Commit 5a89eae

Browse files
committed
mgr/dashboard: fall back to server_cert
if root_ca is not found Signed-off-by: Nizamudeen A <[email protected]> (cherry picked from commit 0a393ca)
1 parent 91e7328 commit 5a89eae

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

src/pybind/mgr/dashboard/services/nvmeof_conf.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,17 @@ def get_client_key(cls, service_name: str):
8787

8888
@classmethod
8989
def get_root_ca_cert(cls, service_name: str):
90-
root_ca_cert = cls.from_cert_store('nvmeof_root_ca_cert', service_name)
91-
return root_ca_cert.encode() if root_ca_cert else None
90+
try:
91+
root_ca_cert = cls.from_cert_store('nvmeof_root_ca_cert', service_name)
92+
return root_ca_cert.encode()
93+
except DashboardException:
94+
# If root_ca_cert is not set, use server_cert as root_ca_cert
95+
return cls.get_server_cert(service_name)
96+
97+
@classmethod
98+
def get_server_cert(cls, service_name: str):
99+
server_cert = cls.from_cert_store('nvmeof_server_cert', service_name)
100+
return server_cert.encode() if server_cert else None
92101

93102
@classmethod
94103
def from_cert_store(cls, entity: str, service_name: str, key=False):

0 commit comments

Comments
 (0)