bundles/systemd-networkd: proper config

bundles/systemd-networkd/files/template.network

@@ -1,6 +1,35 @@
+<%
+    from ipaddress import ip_network
+%>\
 [Match]
 Name=${interface}
 
+
+% for addr in sorted(config.get('ips', set())):
+[Address]
+<%
+    if '/' in addr:
+        ip, prefix = addr.split('/')
+    else:
+        ip = addr
+        prefix = '32'
+%>\
+Address=${ip}/${prefix}
+
+% endfor
+
+% if 'gateway4' in config:
+[Route]
+Gateway=${config['gateway4']}
+GatewayOnLink=yes
+% endif
+
+% if 'gateway6' in config:
+[Route]
+Gateway=${config['gateway6']}
+GatewayOnLink=yes
+% endif
+
 [Network]
 % if config.get('dhcp', False):
 DHCP=yes
@@ -11,23 +40,6 @@ DHCP=no
 IPv6AcceptRA=no
 % endif
 
-% for addr in sorted(config.get('ip_addresses', set())):
-Address=${addr}
-% endfor
-
-% if config.get('ip4_masquerade_outgoing', False):
-IPMasquerade=yes
-IPForward=ipv4
+% if config.get('forwarding', False):
+IPForward=yes
 %endif
-
-% if 'ip6_gateway' in config:
-[Route]
-Gateway=${config['ip6_gateway']}
-GatewayOnLink=yes
-% endif
-
-% if 'ip4_gateway' in config:
-[Route]
-Gateway=${config['ip4_gateway']}
-GatewayOnLink=yes
-% endif