From 8c76a1b0c6e925b529b1cd03ded5b9d0b3d707c4 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 22 Jul 2020 23:42:03 +0200 Subject: yet another refactoring of the network config --- roles/vm/guest/network/templates/interfaces.j2 | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'roles/vm/guest/network/templates') diff --git a/roles/vm/guest/network/templates/interfaces.j2 b/roles/vm/guest/network/templates/interfaces.j2 index 8e2f324c..c8ff5b94 100644 --- a/roles/vm/guest/network/templates/interfaces.j2 +++ b/roles/vm/guest/network/templates/interfaces.j2 @@ -13,10 +13,18 @@ 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 -{% include 'interfaces/' + (interface.config | default('simple')) + '.j2' %} -{% if 'address6' in interface %} +{% if 'content' in interface %} + {{ interface.content | indent(2) }} +{% else %} +{% include 'interfaces/' + (interface.template | default('simple')) + '.j2' %} +{% endif %} +{% if 'content6' in interface or 'address6' in interface %} iface {{ interface.name }} inet6 static -{% include 'interfaces/' + (interface.config | default('simple6')) + '.j2' %} +{% if 'content6' in interface %} + {{ interface.content6 | indent(2) }} +{% else %} +{% include 'interfaces/' + (interface.template6 | default('simple6')) + '.j2' %} +{% endif %} {% endif %} {% endfor %} -- cgit v1.2.3