From 4ebb4b6ad3441179388bdef1937bd065a6707724 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <ynerant@crans.org>
Date: Mon, 19 Jul 2021 11:49:04 +0200
Subject: [PATCH] Update IP for Crans/Aurore interconnection

Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
 roles/bird/templates/bird/bird.conf.j2        | 9 +++------
 roles/bird/templates/bird/bird6.conf.j2       | 9 +++------
 roles/router/templates/keepalived-aurore.conf | 4 ++--
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/roles/bird/templates/bird/bird.conf.j2 b/roles/bird/templates/bird/bird.conf.j2
index abb8477..3529c27 100644
--- a/roles/bird/templates/bird/bird.conf.j2
+++ b/roles/bird/templates/bird/bird.conf.j2
@@ -5,15 +5,12 @@ router id 45.66.111.254;
 # Zayo
 listen bgp address 83.167.52.69 port 179;
 # Crans
-listen bgp address 185.230.77.253 port 179;
+listen bgp address 185.230.79.254 port 179;
 
 protocol kernel {
     scan time 60;
     import none;
-    export filter {
-        if ( net ~ [ 45.66.108.0/22 ] ) then reject;
-        accept;
-    };
+    export all;
 };
 
 protocol device {
@@ -33,7 +30,7 @@ protocol bgp zayo {
 
 protocol bgp crans {
     local as 43619;
-    neighbor 185.230.77.254 as 204515;
+    neighbor 185.230.79.253 as 204515;
     import all;
     export all;
 }
diff --git a/roles/bird/templates/bird/bird6.conf.j2 b/roles/bird/templates/bird/bird6.conf.j2
index 5cab612..ee541fb 100644
--- a/roles/bird/templates/bird/bird6.conf.j2
+++ b/roles/bird/templates/bird/bird6.conf.j2
@@ -3,7 +3,7 @@ router id 45.66.111.254;
 # Zayo
 listen bgp address 2001:1b48:2:103::d7:2 port 179;
 # Crans
-listen bgp address 2a0c:700:2001::1 port 179;
+listen bgp address 2a0c:700:28::2 port 179;
 
 log syslog all;
 
@@ -11,10 +11,7 @@ protocol kernel {
     persist;
     scan time 60;
     import none;
-    export filter {
-        if ( net ~ [ 2a09:6840::/29 ] ) then reject;
-        accept;
-    };
+    export all;
 }
 
 protocol device {
@@ -34,7 +31,7 @@ protocol bgp zayo {
 
 protocol bgp crans {
     local as 43619;
-    neighbor 2a0c:700:2001::2 as 204515;
+    neighbor 2a0c:700:28::1 as 204515;
     import all;
     export all;
 }
diff --git a/roles/router/templates/keepalived-aurore.conf b/roles/router/templates/keepalived-aurore.conf
index 514bc9c..57c18d5 100644
--- a/roles/router/templates/keepalived-aurore.conf
+++ b/roles/router/templates/keepalived-aurore.conf
@@ -57,7 +57,7 @@ vrrp_instance VI_ROUT_aurore_IPv4 {
     10.131.0.254/16 brd 10.131.255.255 dev ens23 scope global
 
     # VLAN 121: Interco Crans
-    185.230.77.253/30 brd 185.230.77.255 dev ens2 scope global
+    185.230.79.254/29 dev ens2 scope global
   }
 
   virtual_routes {
@@ -197,7 +197,7 @@ vrrp_instance VI_ROUT_aurore_IPv6 {
     2a09:6840:131::254/64 dev ens23 scope global
 
     # VLAN 121: Interco Crans
-    2a0c:700:2001::1/126 dev ens2 scope global
+    2a0c:700:28::2/64 dev ens2 scope global
   }
 
   virtual_routes {