mgr/cephadm: reverting usage of Org Name 'Ceph' in self-signed certs

This could cause issues on upgrades as it imply chaning the root CA CN

Signed-off-by: Redouane Kachach <rkachach@ibm.com>

diff --git a/src/pybind/mgr/cephadm/ssl_cert_utils.py b/src/pybind/mgr/cephadm/ssl_cert_utils.py
index d641838c5dcdeb8a43bde5b4a762baf1abb24272..ee8d88e55f031579ffc68527f5390f2e051feb09 100644 (file)
--- a/src/pybind/mgr/cephadm/ssl_cert_utils.py
+++ b/src/pybind/mgr/cephadm/ssl_cert_utils.py
@@ -137,7 +137,6 @@ class SSLCerts:
         root_public_key = self.root_key.public_key()
         root_builder = x509.CertificateBuilder()
         root_ca_name = x509.Name([
-            x509.NameAttribute(NameOID.ORGANIZATION_NAME, u"Ceph"),
             x509.NameAttribute(NameOID.COMMON_NAME, u'cephadm-root'),
         ])
         root_builder = root_builder.subject_name(root_ca_name)
@@ -199,7 +198,6 @@ class SSLCerts:
 
         builder = x509.CertificateBuilder()
         root_ca_name = x509.Name([
-            x509.NameAttribute(NameOID.ORGANIZATION_NAME, u"Ceph"),
             x509.NameAttribute(NameOID.COMMON_NAME, u'cephadm-root'),
         ])
         builder = builder.subject_name(x509.Name([x509.NameAttribute(NameOID.COMMON_NAME, addrs[0]), ]))