xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-09-11 03:56:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix to more reliably default to 47

Browse Source
This commit is contained in:
Jarrod Johnson
2026-06-23 09:55:29 -04:00
parent cf7f2f434d
commit 1449eee4f4
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
confluent_server/confluent/config/attributes.py
+1 -1
View File
@@ -667,7 +667,7 @@ node = {
'description': ('Fingerprint of the TLS certificate for service running on host.'),
},
'pubkeys.tls_lifetime': {
'description': ('When granting a certificate to the node or related BMC, this is the validity in days. Default is 45 days.'),
'description': ('When granting a certificate to the node or related BMC, this is the validity in days. Default is 47 days.'),
},
'pubkeys.ssh': {
'description': ('Fingerprint of the SSH key of the OS running on the '
confluent_server/confluent/discovery/handlers/redfishbmc.py
+3 -1
View File
@@ -328,7 +328,9 @@ class NodeHandler(generic.NodeHandler):
if hwmgt_method != 'redfish':
return
tls_lifetime = self.configmanager.get_node_attributes(nodename, 'pubkeys.tls_lifetime')
tls_lifetime = tls_lifetime.get(nodename, {}).get('pubkeys.tls_lifetime', {}).get('value', 45)
tls_lifetime = tls_lifetime.get(nodename, {}).get('pubkeys.tls_lifetime', {}).get('value', 47)
if not tls_lifetime:
tls_lifetime = 47
tls_lifetime = int(tls_lifetime)
proc = await asyncio.create_subprocess_exec(
'/opt/confluent/bin/nodecertutil', nodename, 'signbmccert', '--days', str(tls_lifetime)
confluent_server/confluent/plugins/hardwaremanagement/redfish.py
+1 -1
View File
@@ -599,7 +599,7 @@ class IpmiHandler:
tls_lifetime = self.inputdata.get_days(self.node)
except KeyError:
tls_lifetime = self.cfm.get_node_attributes(self.node, 'hardwaremanagement.manager_tls_lifetime')
tls_lifetime = tls_lifetime.get(self.node, {}).get('hardwaremanagement.manager_tls_lifetime', {}).get('value', 45)
tls_lifetime = tls_lifetime.get(self.node, {}).get('hardwaremanagement.manager_tls_lifetime', {}).get('value', 47)
tls_lifetime = int(tls_lifetime)
with tempfile.NamedTemporaryFile() as tmpfile:
tmpfile.write(csr.encode())
confluent_server/confluent/selfservice.py
+3 -1
View File
@@ -420,7 +420,9 @@ async def handle_request(req, make_response, mimetype):
certfile.close()
subj = '/CN={0}'.format(nodename)
tls_lifetime = cfg.get_node_attributes(nodename, 'pubkeys.tls_lifetime')
tls_lifetime = tls_lifetime.get(nodename, {}).get('pubkeys.tls_lifetime', {}).get('value', 45)
tls_lifetime = tls_lifetime.get(nodename, {}).get('pubkeys.tls_lifetime', {}).get('value', 47)
if not tls_lifetime:
tls_lifetime = 47
tls_lifetime = int(tls_lifetime)
await certutil.create_certificate(None, certname, tmpfile.name, subj, principals_to_san(pals), backdate=False,
days=tls_lifetime)