Skip to content

Commit 40e5ab7

Browse files
committed
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 <[email protected]>
1 parent 37869ee commit 40e5ab7

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

src/pybind/mgr/cephadm/ssl_cert_utils.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ def generate_root_cert(
137137
root_public_key = self.root_key.public_key()
138138
root_builder = x509.CertificateBuilder()
139139
root_ca_name = x509.Name([
140-
x509.NameAttribute(NameOID.ORGANIZATION_NAME, u"Ceph"),
141140
x509.NameAttribute(NameOID.COMMON_NAME, u'cephadm-root'),
142141
])
143142
root_builder = root_builder.subject_name(root_ca_name)
@@ -199,7 +198,6 @@ def generate_cert(
199198

200199
builder = x509.CertificateBuilder()
201200
root_ca_name = x509.Name([
202-
x509.NameAttribute(NameOID.ORGANIZATION_NAME, u"Ceph"),
203201
x509.NameAttribute(NameOID.COMMON_NAME, u'cephadm-root'),
204202
])
205203
builder = builder.subject_name(x509.Name([x509.NameAttribute(NameOID.COMMON_NAME, addrs[0]), ]))

0 commit comments

Comments
 (0)