xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-01-14 19:57:50 +00:00
Code Issues Projects Releases Wiki Activity

Allow ident net config to override deploycfg

Browse Source 
In routed deployment, deploycfg will
be missing network info, use
the ident provided network if detected.
This commit is contained in:
Jarrod Johnson 2022-07-27 11:41:29 -04:00
parent c1ad4357dc
commit 35701cdf01
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
confluent_osdeploy/esxi7/profiles/hypervisor/scripts/makeksnet
View File

@ -1,7 +1,7 @@
#!/usr/bin/python
import re
import subprocess
import yaml
uplinkmatch = re.compile('^\s*Uplinks:\s*(.*)')
nodename = None
for inf in open('/etc/confluent/confluent.info', 'r').read().split('\n'):
@ -33,6 +33,16 @@ for info in vswinfo.split('\n'):
upinfo = uplinkmatch.match(info)
if upinfo:
vmnic = upinfo.group(1)
try:
with open('/tmp/confluentident/cnflnt.yml') as identin:
identcfg = yaml.safe_load(identin)
ncfg = identcfg['netcfgs'][0]
cfg['ipv4_method'] = ncfg['ipv4_method']
cfg['ipv4_address'] = ncfg['ipv4_address'].split('/')[0]
cfg['ipv4_netmask'] = ncfg['ipv4_netmask']
cfg['ipv4_gateway'] = ncfg['ipv4_gateway']
except Exception:
pass
netline = 'network --hostname={0} --bootproto={1}'.format(nodename, cfg['ipv4_method'])
if vmnic:
netline += ' --device={0}'.format(vmnic)