From: Nizamudeen A <nia@redhat.com>
Date: Fri, 12 Jul 2024 05:10:02 +0000 (+0530)
Subject: Merge pull request #57712 from rhcs-dashboard/dashboard-nvmf-mtls-conf
X-Git-Tag: v20.0.0~1544
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=91d48968a5ae29fc0c836cacb2c2bdd2747aa257;p=ceph.git

Merge pull request #57712 from rhcs-dashboard/dashboard-nvmf-mtls-conf

mgr/dashboard: use secure_channel for grpc requests

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: baum <NOT@FOUND>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Redouane Kachach <rkachach@redhat.com>
---

91d48968a5ae29fc0c836cacb2c2bdd2747aa257
diff --cc src/pybind/mgr/cephadm/inventory.py
index 492a9a98d34d,b736807e893b..8b536057c57b
--- a/src/pybind/mgr/cephadm/inventory.py
+++ b/src/pybind/mgr/cephadm/inventory.py
@@@ -1888,8 -1945,10 +1945,11 @@@ class CertKeyStore()
              'rgw_frontend_ssl_cert': {},  # service-name -> cert
              'iscsi_ssl_cert': {},  # service-name -> cert
              'ingress_ssl_cert': {},  # service-name -> cert
+             'nvmeof_server_cert': {},  # service-name -> cert
+             'nvmeof_client_cert': {},  # service-name -> cert
+             'nvmeof_root_ca_cert': {},  # service-name -> cert
              'agent_endpoint_root_cert': Cert(),  # cert
 +            'mgmt_gw_root_cert': Cert(),  # cert
              'service_discovery_root_cert': Cert(),  # cert
              'grafana_cert': {},  # host -> cert
              'alertmanager_cert': {},  # host -> cert