bundles/{radvd,wide-dhcp6c}: remove metadata key integrate-with-pppd

bundles/radvd/items.py

@@ -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',

bundles/radvd/metadata.py

@@ -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 {}

bundles/wide-dhcp6c/items.py

@@ -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',

bundles/wide-dhcp6c/metadata.py

@@ -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 {}

nodes/home/router.py

@@ -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',