xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-06-02 09:19:39 +00:00
Code Issues Projects Releases Wiki Activity

Remove cloud-init netplan if redundant

Browse Source
This commit is contained in:
Jarrod Johnson
2026-06-01 09:33:25 -04:00
parent 223ae16892
commit 418a52e66d
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
confluent_osdeploy/common/profile/scripts/confignet
+21 -2
View File
@@ -226,20 +226,39 @@ class NetplanManager(object):
if dnsdomain not in currdnsdomain:
needcfgwrite = True
currdnsdomain.append(dnsdomain)
prune_from_cloudinit = []
if needcfgwrite:
needcfgapply = True
oumask = os.umask(0o77)
if devname in self.cfgbydev:
prune_from_cloudinit.append(devname)
newcfg = {'network': {'version': 2, 'ethernets': {devname: self.cfgbydev[devname]}}}
cfgfile = '/etc/netplan/10-{0}-confluentcfg.yaml'.format(devname)
elif devname in self.cfgbybond:
newcfg = {'network': {'version': 2, 'bonds': {devname: self.cfgbybond[devname]}}}
for iface in newcfg['network']['bonds'][devname]['interfaces']:
with open('/etc/netplan/{0}-confluentcfg.yaml'.format(iface), 'w') as planout:
prune_from_cloudinit.append(iface)
with open('/etc/netplan/10-{0}-confluentcfg.yaml'.format(iface), 'w') as planout:
planout.write(yaml.dump({'network': {'version': 2, 'ethernets': {iface: {'dhcp4': False}}}}))
with open('/etc/netplan/{0}-confluentcfg.yaml'.format(devname), 'w') as planout:
cfgfile = '/etc/netplan/30-{0}-confluentcfg.yaml'.format(devname)
with open(cfgfile, 'w') as planout:
planout.write(yaml.dump(newcfg))
os.umask(oumask)
if prune_from_cloudinit:
with open('/etc/netplan/50-cloud-init.yaml', 'r') as cloudinit:
cloudinfo = yaml.safe_load(cloudinit)
for clouddev in cloudinfo.get('network', {}).get('ethernets', {}):
if clouddev in prune_from_cloudinit:
del cloudinfo['network']['ethernets'][clouddev]
if not cloudinfo['network'].get('ethernets', {}):
os.remove('/etc/netplan/50-cloud-init.yaml')
else:
oumask = os.umask(0o77)
with open('/etc/netplan/50-cloud-init.yaml', 'w') as cloudinit:
cloudinit.write(yaml.dump(cloudinfo))
os.umask(oumask)
if needcfgapply:
subprocess.check_call(['netplan', 'generate'])
subprocess.call(['netplan', 'apply'])
def getcfgarrpath(self, devpath):