]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #57712 from rhcs-dashboard/dashboard-nvmf-mtls-conf
authorNizamudeen A <nia@redhat.com>
Fri, 12 Jul 2024 05:10:02 +0000 (10:40 +0530)
committerGitHub <noreply@github.com>
Fri, 12 Jul 2024 05:10:02 +0000 (10:40 +0530)
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>
1  2 
src/pybind/mgr/cephadm/inventory.py
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/tests/test_cephadm.py
src/pybind/mgr/cephadm/tests/test_services.py
src/pybind/mgr/orchestrator/_interface.py
src/pybind/mgr/orchestrator/module.py
src/python-common/ceph/deployment/service_spec.py

index 492a9a98d34dae6160cf793471e37d1b0c3b62b2,b736807e893b1ab818f0ec0bf467151b82dc05fa..8b536057c57bddb0271f1f8a41d5bab10e9b0fce
@@@ -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
Simple merge
Simple merge