From 3832accbe548e8bec76e5a54bff13d6670cc40af Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Tue, 17 Sep 2024 20:37:22 +0200
Subject: lhn2pi

---
 tnet/files/hash/bird-tnet.conf   |  7 +++++++
 tnet/files/knot/bird-tnet.conf   |  2 +-
 tnet/files/lhn2pi/bird-tnet.conf | 10 ++++++++++
 tnet/host_vars/hash/bird.yml     |  2 ++
 tnet/host_vars/knot/wg.yml       |  3 +--
 tnet/host_vars/lhn2pi/bird.yml   |  8 +++++---
 tnet/host_vars/lhn2pi/wg.yml     |  3 +--
 7 files changed, 27 insertions(+), 8 deletions(-)

(limited to 'tnet')

diff --git a/tnet/files/hash/bird-tnet.conf b/tnet/files/hash/bird-tnet.conf
index 5ac9690..a570291 100644
--- a/tnet/files/hash/bird-tnet.conf
+++ b/tnet/files/hash/bird-tnet.conf
@@ -51,6 +51,13 @@ protocol bgp tnet_knot from tnet_tpl {
   rr client;
 }
 
+protocol bgp tnet_lhn2pi from tnet_tpl {
+  neighbor fe80:6195:1d43:9655:35f7:9dba:798c:26b9;
+  interface "tnet-lhn2pi";
+
+  rr client;
+}
+
 protocol bgp tnet_node1 from tnet_tpl {
   neighbor fe80:a026:6ec2:b356:21c5:b51:22b9:a1df;
   interface "tnet-node1";
diff --git a/tnet/files/knot/bird-tnet.conf b/tnet/files/knot/bird-tnet.conf
index e774e31..f21be09 100644
--- a/tnet/files/knot/bird-tnet.conf
+++ b/tnet/files/knot/bird-tnet.conf
@@ -66,7 +66,7 @@ protocol bgp tnet_kv24ix from tnet_tpl {
 }
 
 protocol bgp tnet_lhn2pi from tnet_tpl {
-  neighbor fdb1:4242:3538:ffff:374e:2c7d:319e:e527;
+  neighbor fe80:d83a:350b:2162:6eda:1cc1:9cd7:80e9;
   interface "tnet-lhn2pi";
 
   rr client;
diff --git a/tnet/files/lhn2pi/bird-tnet.conf b/tnet/files/lhn2pi/bird-tnet.conf
index a4498cd..9f0ef8c 100644
--- a/tnet/files/lhn2pi/bird-tnet.conf
+++ b/tnet/files/lhn2pi/bird-tnet.conf
@@ -36,3 +36,13 @@ template bgp tnet_tpl {
     };
   };
 }
+
+protocol bgp tnet_hash from tnet_tpl {
+  neighbor fe80:6195:1d43:9655:35f7:9dba:798c:26b8;
+  interface "tnet-hash";
+}
+
+protocol bgp tnet_knot from tnet_tpl {
+  neighbor fe80:d83a:350b:2162:6eda:1cc1:9cd7:80e8;
+  interface "tnet-knot";
+}
diff --git a/tnet/host_vars/hash/bird.yml b/tnet/host_vars/hash/bird.yml
index 663f8e1..2b4bb51 100644
--- a/tnet/host_vars/hash/bird.yml
+++ b/tnet/host_vars/hash/bird.yml
@@ -4,6 +4,8 @@ tnet_bird_peers:
     interface: tnet-confltrio
   knot:
     rr_client: true
+  lhn2pi:
+    rr_client: true
   node1:
     rr_client: true
   node2:
diff --git a/tnet/host_vars/knot/wg.yml b/tnet/host_vars/knot/wg.yml
index 243c9f2..9ad867e 100644
--- a/tnet/host_vars/knot/wg.yml
+++ b/tnet/host_vars/knot/wg.yml
@@ -15,8 +15,7 @@ tnet_wg:
     address: fdb1:4242:3538:ffff:59d7:cf77:8b5d:761a
   lhn2pi:
     port: 51005
-    #address: fe80:440a:607e:b685:c955:93ae:29f8:dcd8
-    address: fdb1:4242:3538:ffff:374e:2c7d:319e:e526
+    address: fe80:d83a:350b:2162:6eda:1cc1:9cd7:80e8
   astyanax:
     port: 51006
     address: fe80:6728:53fc:fc81:40b3:9beb:8336:ba56
diff --git a/tnet/host_vars/lhn2pi/bird.yml b/tnet/host_vars/lhn2pi/bird.yml
index d132dd7..564c993 100644
--- a/tnet/host_vars/lhn2pi/bird.yml
+++ b/tnet/host_vars/lhn2pi/bird.yml
@@ -1,3 +1,5 @@
-tnet_bird_peers: []
-#  hash:
-#  knot:
+tnet_bird_peers:
+  hash:
+  knot:
+
+birdv: 2008
diff --git a/tnet/host_vars/lhn2pi/wg.yml b/tnet/host_vars/lhn2pi/wg.yml
index f9e741f..c94745c 100644
--- a/tnet/host_vars/lhn2pi/wg.yml
+++ b/tnet/host_vars/lhn2pi/wg.yml
@@ -1,8 +1,7 @@
 tnet_wg:
   knot:
     endpoint: knot.inamo.no:51005
-    #address: fe80:440a:607e:b685:c955:93ae:29f8:dcd9
-    address: fdb1:4242:3538:ffff:374e:2c7d:319e:e527
+    address: fe80:d83a:350b:2162:6eda:1cc1:9cd7:80e9
   hash:
     endpoint: hash.trygvis.io:51003
     address: fe80:6195:1d43:9655:35f7:9dba:798c:26b9
-- 
cgit v1.2.3