From 071d82529dab5edbbae4b2fc4f808a19704b04dc Mon Sep 17 00:00:00 2001
From: Jeltz <jeltz@auro.re>
Date: Thu, 2 Nov 2023 17:55:07 +0100
Subject: [PATCH] misc: edge: oti vip

---
 group_vars/edge/keepalived.yml          | 4 ++++
 host_vars/edge-1.back.infra.auro.re.yml | 8 ++++----
 host_vars/edge-2.back.infra.auro.re.yml | 7 ++++++-
 roles/keepalived/defaults/main.yml      | 1 +
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/group_vars/edge/keepalived.yml b/group_vars/edge/keepalived.yml
index c09316f..5428e3a 100644
--- a/group_vars/edge/keepalived.yml
+++ b/group_vars/edge/keepalived.yml
@@ -12,6 +12,10 @@ keepalived__virtual_addresses:
     - 2001:1b48:2:103::d7:2/126
     - 83.167.52.69/31
     - fe80::1/10
+  oti0:
+    - 2a00:a4c0:100c:1::b/127
+    - 77.95.70.11/31
+    - fe80::1/10
 
 keepalived__main: "{{ inventory_hostname_short == 'edge-1' }}"
 ...
diff --git a/host_vars/edge-1.back.infra.auro.re.yml b/host_vars/edge-1.back.infra.auro.re.yml
index 1451db9..e9bf7d6 100644
--- a/host_vars/edge-1.back.infra.auro.re.yml
+++ b/host_vars/edge-1.back.infra.auro.re.yml
@@ -27,13 +27,13 @@ ifupdown2__interfaces:
       - 2a09:6840:203::1:1/64
       - 10.203.1.1/16
   viarezo0:
-    ipv6_addrgen: false
+    addresses:
+      - 2a0c:b641:2ff::6/125
+      - 192.159.121.133/29
   router0:
     addresses:
       - 2a09:6840:129::10:2/56
       - 10.129.10.2/16
   oti0:
-    addresses:
-      - 2a00:a4c0:100c:1::b/127
-      - 77.95.70.11/31
+    ipv6_addrgen: false
 ...
diff --git a/host_vars/edge-2.back.infra.auro.re.yml b/host_vars/edge-2.back.infra.auro.re.yml
index 68a8f5e..40950ed 100644
--- a/host_vars/edge-2.back.infra.auro.re.yml
+++ b/host_vars/edge-2.back.infra.auro.re.yml
@@ -7,6 +7,7 @@ systemd_link__links:
   back0: 04:00:00:DE:22:E6
   viarezo0: 04:00:00:45:FA:E6
   router0: 04:00:00:AD:D7:71
+  oti0: 02:00:00:05:0E:A6
 
 ifupdown2__interfaces:
   adm0:
@@ -26,9 +27,13 @@ ifupdown2__interfaces:
       - 2a09:6840:203::1:2/64
       - 10.203.1.2/16
   viarezo0:
-    ipv6_addrgen: false
+    addresses:
+      - 2a0c:b641:2ff::7/125
+      - 192.159.121.134/29
   router0:
     addresses:
       - 2a09:6840:129::10:102/56
       - 10.129.10.102/16
+  oti0:
+    ipv6_addrgen: false
 ...
diff --git a/roles/keepalived/defaults/main.yml b/roles/keepalived/defaults/main.yml
index 4b76f26..adeee6a 100644
--- a/roles/keepalived/defaults/main.yml
+++ b/roles/keepalived/defaults/main.yml
@@ -1,5 +1,6 @@
 ---
 keepalived__virtual_addresses: {}
+keepalived__virtual_blackholes: []
 keepalived__virtual_routes: {}
 keepalived__notify_master: []
 keepalived__notify_backup: []