From: Nizamudeen A <nia@redhat.com>
Date: Mon, 27 May 2024 04:35:21 +0000 (+0530)
Subject: mgr/dashboard: fall back to server_cert
X-Git-Tag: v20.0.0~1544^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F57712%2Fhead;p=ceph.git

mgr/dashboard: fall back to server_cert

if root_ca is not found

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 0a393ca9bde714524da369caaef1c097472f791c)
---

diff --git a/src/pybind/mgr/dashboard/services/nvmeof_conf.py b/src/pybind/mgr/dashboard/services/nvmeof_conf.py
index 5777d33750f1..3879e308db47 100644
--- a/src/pybind/mgr/dashboard/services/nvmeof_conf.py
+++ b/src/pybind/mgr/dashboard/services/nvmeof_conf.py
@@ -87,8 +87,17 @@ class NvmeofGatewaysConfig(object):
 
     @classmethod
     def get_root_ca_cert(cls, service_name: str):
-        root_ca_cert = cls.from_cert_store('nvmeof_root_ca_cert', service_name)
-        return root_ca_cert.encode() if root_ca_cert else None
+        try:
+            root_ca_cert = cls.from_cert_store('nvmeof_root_ca_cert', service_name)
+            return root_ca_cert.encode()
+        except DashboardException:
+            # If root_ca_cert is not set, use server_cert as root_ca_cert
+            return cls.get_server_cert(service_name)
+
+    @classmethod
+    def get_server_cert(cls, service_name: str):
+        server_cert = cls.from_cert_store('nvmeof_server_cert', service_name)
+        return server_cert.encode() if server_cert else None
 
     @classmethod
     def from_cert_store(cls, entity: str, service_name: str, key=False):