From 212433f736581a552762ad4ce5a1c39a55bffeb6 Mon Sep 17 00:00:00 2001
From: Benjamin Graillot <graillot@crans.org>
Date: Thu, 20 Aug 2020 18:24:29 +0200
Subject: [PATCH] [keepalived] Add IPv6

---
 group_vars/keepalived.yml                                | 9 ++++++---
 roles/keepalived/templates/keepalived/keepalived.conf.j2 | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/group_vars/keepalived.yml b/group_vars/keepalived.yml
index 68cea95a..2b4fbd40 100644
--- a/group_vars/keepalived.yml
+++ b/group_vars/keepalived.yml
@@ -8,20 +8,23 @@ glob_keepalived:
     dhcp:
       password: "plopisverysecure"
       id: 60
-      ipv6: no
+      ipv6: yes
       notify: /usr/scripts/notify-dhcp
       zones:
         - vlan: adh
           ipv4: 185.230.78.99/24
           brd: true
-        - vlan: adh-nat
+          ipv6: 2a0c:700:12::ff:fe00:9912/48
+        - vlan: adh_nat
           ipv4: 100.64.0.99/16
           brd: true
+          ipv6: 2a0c:700:13::ff:fe00:9913/48
     radius:
       password: 'plopisverysecure'
       id: 61
-      ipv6: no
+      ipv6: yes
       zones:
         - vlan: infra
           ipv4: 172.16.32.99/22
           brd: true
+          ipv6: fd00::11:0:ff:fe00:9911/64
diff --git a/roles/keepalived/templates/keepalived/keepalived.conf.j2 b/roles/keepalived/templates/keepalived/keepalived.conf.j2
index f3dbc3cc..ee797434 100644
--- a/roles/keepalived/templates/keepalived/keepalived.conf.j2
+++ b/roles/keepalived/templates/keepalived/keepalived.conf.j2
@@ -41,7 +41,7 @@ vrrp_instance {{ instance.tag }}6 {
   priority {{ instance.priority }}
   smtp_alert
 
-  interface {{ keepalived.pool[instance.name].administration }}
+  interface {{ interfaces.adm }}
   virtual_router_id {{ keepalived.pool[instance.name].id }}
   advert_int 2
   authentication {