From f528c665d761031500b83e161ec91e787a307dad Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 5 Jul 2019 23:01:29 +0200
Subject: fix vm-install role

---
 roles/vm/network/templates/interfaces.j2   | 6 ++++++
 roles/vm/network/templates/netplan.yaml.j2 | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'roles/vm')

diff --git a/roles/vm/network/templates/interfaces.j2 b/roles/vm/network/templates/interfaces.j2
index 829a3e7d..d59d53e1 100644
--- a/roles/vm/network/templates/interfaces.j2
+++ b/roles/vm/network/templates/interfaces.j2
@@ -15,3 +15,9 @@ iface {{ network.primary.interface }} inet static
   gateway {{ network.primary.gateway }}
   pre-up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/accept_ra
   pre-up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/autoconf
+{% if 'prefix6' in network.primary %}
+
+iface {{ network.primary.interface }} inet6 static
+  address {{ network.primary.prefix6 }}
+  gateway {{ network.primary.gateway6 }}
+{% endif %}
diff --git a/roles/vm/network/templates/netplan.yaml.j2 b/roles/vm/network/templates/netplan.yaml.j2
index 0d78ab46..7725f15f 100644
--- a/roles/vm/network/templates/netplan.yaml.j2
+++ b/roles/vm/network/templates/netplan.yaml.j2
@@ -5,6 +5,11 @@ network:
   renderer: networkd
   ethernets:
     {{ network.primary.interface }}:
-      addresses: [ {{ (network.primary.ip + '/' + network.primary.mask) | ipaddr('address/prefix') }} ]
+      addresses:
+        - {{ (network.primary.ip + '/' + network.primary.mask) | ipaddr('address/prefix') }}
+{% if 'prefix6' in network.primary %}
+        - {{ network.primary.prefix6 }}
+      gateway6: {{ network.primary.gateway6 }}
+{% endif %}
       gateway4: {{ network.primary.gateway }}
       accept-ra: false
-- 
cgit v1.2.3