From ed3885ac85e1a005d972662f966849bf626d5fba Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 12 Jun 2020 13:44:47 +0200
Subject: initial tests with new network config

---
 roles/vm/network/tasks/main.yml           | 37 +++++++++++++-------------
 roles/vm/network/templates/interfaces.j2  | 44 ++++++++++++++++++-------------
 roles/vm/network/templates/resolv.conf.j2 |  2 +-
 3 files changed, 46 insertions(+), 37 deletions(-)

(limited to 'roles/vm/network')

diff --git a/roles/vm/network/tasks/main.yml b/roles/vm/network/tasks/main.yml
index b17aba8b..27a7682a 100644
--- a/roles/vm/network/tasks/main.yml
+++ b/roles/vm/network/tasks/main.yml
@@ -1,24 +1,25 @@
 ---
-- block:
-    - name: remove legacy systemd.link units
-      loop:
-        - 50-virtio-kernel-names.link
-        - 99-default.link
-      file:
-        name: "/etc/systemd/network/{{ item }}"
-        state: absent
+- name: configure systemd link units
+  when: network_cooked.systemd_link is defined
+  block:
+  - name: remove legacy systemd.link units
+    loop:
+      - 50-virtio-kernel-names.link
+      - 99-default.link
+    file:
+      name: "/etc/systemd/network/{{ item }}"
+      state: absent
 
-    - name: install systemd network link units
-      loop: "{{ network.systemd_link.interfaces }}"
-      loop_control:
-        label: "{{ item.name }}"
-        index_var: interface_index
-      template:
-        src: systemd.link.j2
-        dest: "/etc/systemd/network/{{ '%02d' | format(interface_index + 11) }}-{{ item.name }}.link"
-      notify: rebuild initramfs
+  - name: install systemd network link units
+    loop: "{{ network_cooked.systemd_link.interfaces }}"
+    loop_control:
+      label: "{{ item.name }}"
+      index_var: interface_index
+    template:
+      src: systemd.link.j2
+      dest: "/etc/systemd/network/{{ '%02d' | format(interface_index + 11) }}-{{ item.name }}.link"
+    notify: rebuild initramfs
 
-  when: network.systemd_link is defined
 
 - name: install basic interface config
   template:
diff --git a/roles/vm/network/templates/interfaces.j2 b/roles/vm/network/templates/interfaces.j2
index db0e322f..3c151144 100644
--- a/roles/vm/network/templates/interfaces.j2
+++ b/roles/vm/network/templates/interfaces.j2
@@ -6,25 +6,33 @@ source /etc/network/interfaces.d/*
 # The loopback network interface
 auto lo
 iface lo inet loopback
+{% for interface in network_cooked.interfaces %}
 
-# The primary network interface
-auto {{ network.primary.interface }}
-iface {{ network.primary.interface }} inet static
+
+auto {{ interface.name }}
+iface {{ interface.name }} inet static
   pre-up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/accept_ra
   pre-up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/autoconf
-  address {{ network.primary.ip }}
-  netmask {{ network.primary.mask }}
-{% if 'overlay' in network.primary %}
-  up /bin/ip addr add dev $IFACE {{ network.primary.overlay }}/32
-  up /bin/ip route add default via {{ network.primary.gateway }} src {{ network.primary.overlay }}
-  down /bin/ip route del default via {{ network.primary.gateway }} src {{ network.primary.overlay }}
-  down /bin/ip addr del dev $IFACE {{ network.primary.overlay }}/32
-{% else %}
-  gateway {{ network.primary.gateway }}
-{% endif %}
-{% if 'prefix6' in network.primary %}
+  address {{ interface.ip }}
+  netmask {{ interface.mask }}
+{%   if 'overlay' in interface %}
+  up /bin/ip addr add dev $IFACE {{ interface.overlay }}/32
+{%     if 'gateway' in interface %}
+  up /bin/ip route add default via {{ interface.gateway }} src {{ interface.overlay }}
+  down /bin/ip route del default via {{ interface.gateway }} src {{ interface.overlay }}
+{%     endif %}
+  down /bin/ip addr del dev $IFACE {{ interface.overlay }}/32
+{%   else %}
+{%     if 'gateway' in interface %}
+  gateway {{ interface.gateway }}
+{%     endif %}
+{%   endif %}
+{%   if 'prefix6' in interface %}
 
-iface {{ network.primary.interface }} inet6 static
-  address {{ network.primary.prefix6 }}
-  gateway {{ network.primary.gateway6 }}
-{% endif %}
+iface {{ interface.name }} inet6 static
+  address {{ interface.prefix6 }}
+{%     if 'gateway6' in interface %}
+  gateway {{ interface.gateway6 }}
+{%     endif %}
+{%   endif %}
+{% endfor %}
diff --git a/roles/vm/network/templates/resolv.conf.j2 b/roles/vm/network/templates/resolv.conf.j2
index a32ec181..f62b6ed7 100644
--- a/roles/vm/network/templates/resolv.conf.j2
+++ b/roles/vm/network/templates/resolv.conf.j2
@@ -1,4 +1,4 @@
-{% for nsrv in network.nameservers %}
+{% for nsrv in network_cooked.nameservers %}
 nameserver {{ nsrv }}
 {% endfor %}
 search {{ network.domain }}
-- 
cgit v1.2.3