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

bundles/{radvd,wide-dhcp6c}: remove metadata key integrate-with-pppd
All checks were successful
bundlewrap/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
Franzi 2020-12-18 16:30:17 +01:00
parent fb7b11fdb6
commit da4b139095
Signed by: kunsi
GPG key ID: 12E3D2136B818350
5 changed files with 16 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bundles/radvd/items.py
View file

@ -1,4 +1,4 @@
if node.metadata.get('radvd', {}).get('integrate-with-pppd', False):
if node.has_bundle('pppd'):
files['/etc/ppp/ip-up.d/radvd'] = {
'source': 'ip-up',
'mode': '0755',

19
bundles/radvd/metadata.py
View file

@ -6,16 +6,11 @@ defaults = {
},
}
@metadata_reactor
def pppd(metadata):
if metadata.get('wide-dhcp6c/integrate-with-pppd', False):
return {
'pppd': {
'wait-until-stopped': {
'radvd.service',
},
}
if node.has_bundle('pppd'):
defaults.update({
'pppd': {
'wait-until-stopped': {
'radvd.service',
},
}
return {}
})

2
bundles/wide-dhcp6c/items.py
View file

@ -1,4 +1,4 @@
if node.metadata.get('wide-dhcp6c', {}).get('integrate-with-pppd', False):
if node.has_bundle('pppd'):
files['/etc/ppp/ip-up.d/wide-dhcp6c'] = {
'source': 'ip-up',
'content_type': 'mako',

19
bundles/wide-dhcp6c/metadata.py
View file

@ -17,16 +17,11 @@ defaults = {
},
}
@metadata_reactor
def pppd(metadata):
if metadata.get('wide-dhcp6c/integrate-with-pppd', False):
return {
'pppd': {
'wait-until-stopped': {
'wide-dhcpv6-client.service',
},
}
if node.has_bundle('pppd'):
defaults.update({
'pppd': {
'wait-until-stopped': {
'wide-dhcpv6-client.service',
},
}
return {}
})

2
nodes/home/router.py
View file

@ -95,7 +95,6 @@ nodes['home.router'] = {
},
},
'radvd': {
'integrate-with-pppd': True,
'interfaces': {
'enp1s0.42': {},
},
@ -140,7 +139,6 @@ nodes['home.router'] = {
'ram': 2,
},
'wide-dhcp6c': {
'integrate-with-pppd': True,
'source': 'ppp0',
'targets': {
'enp1s0.42': '1',