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

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

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'] = { files['/etc/ppp/ip-up.d/radvd'] = {
'source': 'ip-up', 'source': 'ip-up',
'mode': '0755', 'mode': '0755',

View file

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

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'] = { files['/etc/ppp/ip-up.d/wide-dhcp6c'] = {
'source': 'ip-up', 'source': 'ip-up',
'content_type': 'mako', 'content_type': 'mako',

View file

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

View file

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