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

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 = {
     },
 }
 
-
-@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 {}
+    })