kunsi/bundlewrap
1
0
Fork 0
Code Issues 1 Pull requests 2 Releases Activity

bundles/systemd-networkd: fix bridge-in-bridge-setup on home.nas not working properly
All checks were successful
kunsi/bundlewrap/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
Franzi 2021-10-11 20:46:07 +02:00
parent 2662fa5976
commit 61e5591628
Signed by: kunsi
GPG key ID: 12E3D2136B818350
3 changed files with 55 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

41
bundles/systemd-networkd/items.py
View file

@ -47,7 +47,7 @@ for interface, config in node.metadata['interfaces'].items():
if '.' in interface:
vlan_id = int(interface.split('.')[1])
vlan_hex = '%02x' % (vlan_id % 255)
files['/etc/systemd/network/60-iface-{}.netdev'.format(interface)] = {
files[f'/etc/systemd/network/{interface}.netdev'] = {
'source': 'template-iface-vlan.netdev',
'content_type': 'mako',
'context': {
@ -62,9 +62,8 @@ for interface, config in node.metadata['interfaces'].items():
'svc_systemd:systemd-networkd:restart',
},
}
weight = 61
elif interface.startswith('dummy'):
files[f'/etc/systemd/network/60-iface-{interface}.netdev'] = {
files[f'/etc/systemd/network/{interface}.netdev'] = {
'source': 'template-dummy.netdev',
'content_type': 'mako',
'context': {
@ -77,12 +76,9 @@ for interface, config in node.metadata['interfaces'].items():
'svc_systemd:systemd-networkd:restart',
},
}
weight = 61
else:
weight = 50
if not config.get('ignore', False):
files['/etc/systemd/network/{}-iface-{}.network'.format(weight, interface)] = {
files[f'/etc/systemd/network/{interface}.network'] = {
'source': template,
'content_type': 'mako',
'context': {
@ -98,7 +94,7 @@ for interface, config in node.metadata['interfaces'].items():
}
for bond, config in node.metadata.get('systemd-networkd/bonds', {}).items():
files['/etc/systemd/network/20-bond-{}.netdev'.format(bond)] = {
files[f'/etc/systemd/network/{bond}.netdev'] = {
'source': 'template-bond.netdev',
'content_type': 'mako',
'context': {
@ -113,7 +109,8 @@ for bond, config in node.metadata.get('systemd-networkd/bonds', {}).items():
'svc_systemd:systemd-networkd:restart',
},
}
files['/etc/systemd/network/21-bond-{}.network'.format(bond)] = {
files[f'/etc/systemd/network/{bond}.network'] = {
'source': 'template-bond.network',
'content_type': 'mako',
'context': {
@ -129,7 +126,12 @@ for bond, config in node.metadata.get('systemd-networkd/bonds', {}).items():
}
for brname, config in node.metadata.get('systemd-networkd/bridges', {}).items():
files['/etc/systemd/network/30-bridge-{}.netdev'.format(brname)] = {
filename = '{}-match-{}'.format(
brname,
'-'.join(sorted(config['match'])),
)
files[f'/etc/systemd/network/{brname}.netdev'] = {
'source': 'template-bridge.netdev',
'content_type': 'mako',
'context': {
@ -142,7 +144,8 @@ for brname, config in node.metadata.get('systemd-networkd/bridges', {}).items():
'svc_systemd:systemd-networkd:restart',
},
}
files['/etc/systemd/network/31-bridge-{}.network'.format(brname)] = {
files[f'/etc/systemd/network/{filename}.network'] = {
'source': 'template-bridge.network',
'content_type': 'mako',
'context': {
@ -157,6 +160,22 @@ for brname, config in node.metadata.get('systemd-networkd/bridges', {}).items():
},
}
if config.get('vlans', set()):
files[f'/etc/systemd/network/{brname}.network'] = {
'source': 'template-bridge-vlan.network',
'content_type': 'mako',
'context': {
'bridge': brname,
'vlans': config.get('vlans', set()),
},
'needed_by': {
'svc_systemd:systemd-networkd',
},
'triggers': {
'svc_systemd:systemd-networkd:restart',
},
}
svc_systemd = {
'systemd-networkd': {},
}