From f7270c46fb700f0bebb309517d590aeda56daf1e Mon Sep 17 00:00:00 2001 From: Kushal Deb Date: Wed, 7 May 2025 15:21:13 +0530 Subject: [PATCH] mgr/cephadm: include cluster FSID in root CA Common Name (CN) Signed-off-by: Kushal Deb --- src/pybind/mgr/cephadm/ssl_cert_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/cephadm/ssl_cert_utils.py b/src/pybind/mgr/cephadm/ssl_cert_utils.py index ee8d88e55f031..516f043f032ef 100644 --- a/src/pybind/mgr/cephadm/ssl_cert_utils.py +++ b/src/pybind/mgr/cephadm/ssl_cert_utils.py @@ -137,7 +137,7 @@ class SSLCerts: root_public_key = self.root_key.public_key() root_builder = x509.CertificateBuilder() root_ca_name = x509.Name([ - x509.NameAttribute(NameOID.COMMON_NAME, u'cephadm-root'), + x509.NameAttribute(NameOID.COMMON_NAME, f'cephadm-root-{self.cluster_fsid}'), ]) root_builder = root_builder.subject_name(root_ca_name) root_builder = root_builder.issuer_name(root_ca_name) @@ -198,7 +198,7 @@ class SSLCerts: builder = x509.CertificateBuilder() root_ca_name = x509.Name([ - x509.NameAttribute(NameOID.COMMON_NAME, u'cephadm-root'), + x509.NameAttribute(NameOID.COMMON_NAME, f'cephadm-root-{self.cluster_fsid}'), ]) builder = builder.subject_name(x509.Name([x509.NameAttribute(NameOID.COMMON_NAME, addrs[0]), ])) builder = builder.issuer_name(root_ca_name) -- 2.39.5