From 1fbfb2f9a6c36807bd678e29eb926df6ae4f5a2b Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <ynerant@crans.org>
Date: Mon, 6 Jun 2022 15:37:44 +0200
Subject: [PATCH] [viarezo] Second link is now working, with IPv6

Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
 group_vars/keepalived.yml                     |  2 +
 .../routeur-daniel.adm.crans.org/bird.yml     | 39 ++++++++++++-------
 host_vars/routeur-jack.adm.crans.org/bird.yml | 39 ++++++++++++-------
 host_vars/routeur-sam.adm.crans.org/bird.yml  | 39 ++++++++++++-------
 4 files changed, 74 insertions(+), 45 deletions(-)

diff --git a/group_vars/keepalived.yml b/group_vars/keepalived.yml
index a4073e1d..4785ed0d 100644
--- a/group_vars/keepalived.yml
+++ b/group_vars/keepalived.yml
@@ -13,6 +13,8 @@ glob_keepalived:
       zones:
         - vlan: via
           ipv4: 138.195.159.250/30
+          ipv6:
+            - {ip: '2a0c:b641:2f3::2/64', scope: 'global'}
         - vlan: aurore
           ipv4: 185.230.79.253/29
           ipv6:
diff --git a/host_vars/routeur-daniel.adm.crans.org/bird.yml b/host_vars/routeur-daniel.adm.crans.org/bird.yml
index 96ddaa77..fd948648 100644
--- a/host_vars/routeur-daniel.adm.crans.org/bird.yml
+++ b/host_vars/routeur-daniel.adm.crans.org/bird.yml
@@ -3,25 +3,23 @@ loc_bird:
   ipv4:
     id: 185.230.79.253
     binds:
-      # - 138.195.159.250
+      - 138.195.159.250
       - 185.230.79.253
     statics:
-      - 185.230.77.0/24
-      - 185.230.78.0/24
-      - 185.230.79.0/24
+      - 185.230.76.0/22
     kernel_filter:
       - 185.230.78.0/24
     bgps:
-      # - name: viarezo
-      #   allow_local_as: 1
-      #   local:
-      #     as: 204515
-      #     address: 138.195.159.250
-      #   remote:
-      #     as: 212424
-      #     address: 138.195.159.249
-      #   allow_export_prefixes:
-      #     - 185.230.76.0/22+
+      - name: viarezo
+        allow_local_as: 1
+        local:
+          as: 204515
+          address: 138.195.159.250
+        remote:
+          as: 212424
+          address: 138.195.159.249
+        allow_export_prefixes:
+          - 185.230.76.0/22+
       - name: aurore
         allow_local_as: 1
         local:
@@ -35,10 +33,21 @@ loc_bird:
   ipv6:
     id: 185.230.79.253
     binds:
+      - 2a0c:b641:2f3::2
       - 2a0c:700:28::1
     statics:
-      - 2a0c:700::/36
+      - 2a0c:700::/32
     bgps:
+      - name: viarezo
+        allow_local_as: 1
+        local:
+          as: 204515
+          address: 2a0c:b641:2f3::2
+        remote:
+          as: 212424
+          address: 2a0c:b641:2f3::1
+        allow_export_prefixes:
+          - 2a0c:700::/32+
       - name: aurore
         allow_local_as: 1
         local:
diff --git a/host_vars/routeur-jack.adm.crans.org/bird.yml b/host_vars/routeur-jack.adm.crans.org/bird.yml
index 96ddaa77..fd948648 100644
--- a/host_vars/routeur-jack.adm.crans.org/bird.yml
+++ b/host_vars/routeur-jack.adm.crans.org/bird.yml
@@ -3,25 +3,23 @@ loc_bird:
   ipv4:
     id: 185.230.79.253
     binds:
-      # - 138.195.159.250
+      - 138.195.159.250
       - 185.230.79.253
     statics:
-      - 185.230.77.0/24
-      - 185.230.78.0/24
-      - 185.230.79.0/24
+      - 185.230.76.0/22
     kernel_filter:
       - 185.230.78.0/24
     bgps:
-      # - name: viarezo
-      #   allow_local_as: 1
-      #   local:
-      #     as: 204515
-      #     address: 138.195.159.250
-      #   remote:
-      #     as: 212424
-      #     address: 138.195.159.249
-      #   allow_export_prefixes:
-      #     - 185.230.76.0/22+
+      - name: viarezo
+        allow_local_as: 1
+        local:
+          as: 204515
+          address: 138.195.159.250
+        remote:
+          as: 212424
+          address: 138.195.159.249
+        allow_export_prefixes:
+          - 185.230.76.0/22+
       - name: aurore
         allow_local_as: 1
         local:
@@ -35,10 +33,21 @@ loc_bird:
   ipv6:
     id: 185.230.79.253
     binds:
+      - 2a0c:b641:2f3::2
       - 2a0c:700:28::1
     statics:
-      - 2a0c:700::/36
+      - 2a0c:700::/32
     bgps:
+      - name: viarezo
+        allow_local_as: 1
+        local:
+          as: 204515
+          address: 2a0c:b641:2f3::2
+        remote:
+          as: 212424
+          address: 2a0c:b641:2f3::1
+        allow_export_prefixes:
+          - 2a0c:700::/32+
       - name: aurore
         allow_local_as: 1
         local:
diff --git a/host_vars/routeur-sam.adm.crans.org/bird.yml b/host_vars/routeur-sam.adm.crans.org/bird.yml
index 96ddaa77..fd948648 100644
--- a/host_vars/routeur-sam.adm.crans.org/bird.yml
+++ b/host_vars/routeur-sam.adm.crans.org/bird.yml
@@ -3,25 +3,23 @@ loc_bird:
   ipv4:
     id: 185.230.79.253
     binds:
-      # - 138.195.159.250
+      - 138.195.159.250
       - 185.230.79.253
     statics:
-      - 185.230.77.0/24
-      - 185.230.78.0/24
-      - 185.230.79.0/24
+      - 185.230.76.0/22
     kernel_filter:
       - 185.230.78.0/24
     bgps:
-      # - name: viarezo
-      #   allow_local_as: 1
-      #   local:
-      #     as: 204515
-      #     address: 138.195.159.250
-      #   remote:
-      #     as: 212424
-      #     address: 138.195.159.249
-      #   allow_export_prefixes:
-      #     - 185.230.76.0/22+
+      - name: viarezo
+        allow_local_as: 1
+        local:
+          as: 204515
+          address: 138.195.159.250
+        remote:
+          as: 212424
+          address: 138.195.159.249
+        allow_export_prefixes:
+          - 185.230.76.0/22+
       - name: aurore
         allow_local_as: 1
         local:
@@ -35,10 +33,21 @@ loc_bird:
   ipv6:
     id: 185.230.79.253
     binds:
+      - 2a0c:b641:2f3::2
       - 2a0c:700:28::1
     statics:
-      - 2a0c:700::/36
+      - 2a0c:700::/32
     bgps:
+      - name: viarezo
+        allow_local_as: 1
+        local:
+          as: 204515
+          address: 2a0c:b641:2f3::2
+        remote:
+          as: 212424
+          address: 2a0c:b641:2f3::1
+        allow_export_prefixes:
+          - 2a0c:700::/32+
       - name: aurore
         allow_local_as: 1
         local:
-- 
GitLab