]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: fix get_cert_with_label to use host instead of fqdn
authorRedouane Kachach <rkachach@ibm.com>
Wed, 11 Feb 2026 14:57:56 +0000 (15:57 +0100)
committerRedouane Kachach <rkachach@ibm.com>
Thu, 14 May 2026 09:08:18 +0000 (11:08 +0200)
Fixes: https://tracker.ceph.com/issues/75009
Signed-off-by: Redouane Kachach <rkachach@ibm.com>
src/pybind/mgr/cephadm/services/cephadmservice.py

index bd7ff8dda0ba21e451ba2298953da91139ff55e5..207295a73ec480d50837a75dd9f2850cf057daea 100644 (file)
@@ -367,7 +367,7 @@ class CephadmService(metaclass=ABCMeta):
         svc_name = svc_spec.service_name()
         ip = ip_addr or self.mgr.inventory.get_addr(daemon_spec.host)
         host_fqdn = self.mgr.get_fqdn(daemon_spec.host)
-        tls_creds = self.mgr.cert_mgr.get_self_signed_tls_credentials(svc_name, host_fqdn, label)
+        tls_creds = self.mgr.cert_mgr.get_self_signed_tls_credentials(svc_name, daemon_spec.host, label)
         if not tls_creds:
             tls_creds = self.mgr.cert_mgr.generate_cert(host_fqdn, ip)
             self.mgr.cert_mgr.save_self_signed_cert_key_pair(svc_name, tls_creds, host=daemon_spec.host, label=label)
@@ -869,7 +869,7 @@ class CephadmService(metaclass=ABCMeta):
                     host=None,
                     ca_cert_name=self.ca_cert_name,
                 )
-            else: # Host Scope
+            else:  # Host Scope
                 self.mgr.cert_mgr.rm_inline_saved_cert_key_pair(
                     self.cert_name,
                     self.key_name,
@@ -918,7 +918,6 @@ class CephadmService(metaclass=ABCMeta):
 
         _cleanup_tls_creds_for_host(svc_name, host, cert_source, other_daemons_in_service=bool(daemons))
 
-
     def purge(self, service_name: str) -> None:
         """Called to carry out any purge tasks following service removal"""
         logger.debug(f'Purge called for {self.TYPE} - no action taken')