From bdd0e280c3615907e494bc45543257d9a9576e5a Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sat, 19 Oct 2024 20:24:25 +0200
Subject: bird

---
 tnet/templates/akili/bird-tnet.conf       | 4 ++--
 tnet/templates/astyanax/bird-tnet.conf    | 4 ++--
 tnet/templates/bird-tnet.conf.j2          | 8 ++++++--
 tnet/templates/conflatorio/bird-tnet.conf | 4 ++--
 tnet/templates/coregonus/bird-tnet.conf   | 3 +--
 tnet/templates/hash/bird-tnet.conf        | 7 +++++--
 tnet/templates/knot/bird-tnet.conf        | 9 +++++++--
 tnet/templates/lhn2pi/bird-tnet.conf      | 4 ++--
 tnet/templates/node1/bird-tnet.conf       | 4 ++--
 tnet/templates/node2/bird-tnet.conf       | 4 ++--
 10 files changed, 31 insertions(+), 20 deletions(-)

(limited to 'tnet/templates')

diff --git a/tnet/templates/akili/bird-tnet.conf b/tnet/templates/akili/bird-tnet.conf
index 24c9b8e..d306fcc 100644
--- a/tnet/templates/akili/bird-tnet.conf
+++ b/tnet/templates/akili/bird-tnet.conf
@@ -10,8 +10,6 @@ template bgp tnet_tpl {
 
   direct;
 
-  password "trygvis";
-
   ipv6 {
     next hop self;
     import filter {
@@ -40,9 +38,11 @@ template bgp tnet_tpl {
 protocol bgp tnet_hash from tnet_tpl {
   neighbor fdb1:4242:3538:ffff:ca85:f812:3935:5fba;
   interface "tnet-hash";
+  password "{{ bgp_password['akili-hash'] }}";
 }
 
 protocol bgp tnet_knot from tnet_tpl {
   neighbor fdb1:4242:3538:ffff:59d7:cf77:8b5d:761a;
   interface "tnet-knot";
+  password "{{ bgp_password['akili-knot'] }}";
 }
diff --git a/tnet/templates/astyanax/bird-tnet.conf b/tnet/templates/astyanax/bird-tnet.conf
index 3dbf4c9..496cebe 100644
--- a/tnet/templates/astyanax/bird-tnet.conf
+++ b/tnet/templates/astyanax/bird-tnet.conf
@@ -10,8 +10,6 @@ template bgp tnet_tpl {
 
   direct;
 
-  password "trygvis";
-
   ipv6 {
     next hop self;
     import filter {
@@ -40,9 +38,11 @@ template bgp tnet_tpl {
 protocol bgp tnet_hash from tnet_tpl {
   neighbor fe80:a0fd:89e4:42c6:f617:7398:abf4:b516;
   interface "tnet-hash";
+  password "{{ bgp_password['astyanax-hash'] }}";
 }
 
 protocol bgp tnet_knot from tnet_tpl {
   neighbor fe80:6728:53fc:fc81:40b3:9beb:8336:ba56;
   interface "tnet-knot";
+  password "{{ bgp_password['astyanax-knot'] }}";
 }
diff --git a/tnet/templates/bird-tnet.conf.j2 b/tnet/templates/bird-tnet.conf.j2
index 2ba456b..1185014 100644
--- a/tnet/templates/bird-tnet.conf.j2
+++ b/tnet/templates/bird-tnet.conf.j2
@@ -10,8 +10,6 @@ template bgp tnet_tpl {
 
   direct;
 
-  password "trygvis";
-
   ipv6 {
     next hop self;
     import filter {
@@ -48,6 +46,12 @@ protocol bgp tnet_{{ p }} from tnet_tpl {
 {% else %}
   interface "tnet-{{ p }}";
 {% endif %}
+{% if inventory_hostname < p %}
+{% set password_var = inventory_hostname + "-" + p %}
+{% else %}
+{% set password_var = p + "-" + inventory_hostname %}
+{% endif %}
+  password "{{ "{{ bgp_password['" + password_var + "'] }}" }}";
 {% if peer.rr_client|default(False) %}
 
   rr client;
diff --git a/tnet/templates/conflatorio/bird-tnet.conf b/tnet/templates/conflatorio/bird-tnet.conf
index 02780a6..4ffcc7f 100644
--- a/tnet/templates/conflatorio/bird-tnet.conf
+++ b/tnet/templates/conflatorio/bird-tnet.conf
@@ -10,8 +10,6 @@ template bgp tnet_tpl {
 
   direct;
 
-  password "trygvis";
-
   ipv6 {
     next hop self;
     import filter {
@@ -40,9 +38,11 @@ template bgp tnet_tpl {
 protocol bgp tnet_hash from tnet_tpl {
   neighbor fe80:4540:476c:d432:2f32:818b:811b:bb61;
   interface "tnet-hash";
+  password "{{ bgp_password['conflatorio-hash'] }}";
 }
 
 protocol bgp tnet_knot from tnet_tpl {
   neighbor fe80:47fc:0660:b91f:1063:a6ae:46bb:7589;
   interface "tnet-knot";
+  password "{{ bgp_password['conflatorio-knot'] }}";
 }
diff --git a/tnet/templates/coregonus/bird-tnet.conf b/tnet/templates/coregonus/bird-tnet.conf
index 95ede41..2d2a573 100644
--- a/tnet/templates/coregonus/bird-tnet.conf
+++ b/tnet/templates/coregonus/bird-tnet.conf
@@ -10,8 +10,6 @@ template bgp tnet_tpl {
 
   direct;
 
-  password "trygvis";
-
   ipv6 {
     next hop self;
     import filter {
@@ -40,4 +38,5 @@ template bgp tnet_tpl {
 protocol bgp tnet_knot from tnet_tpl {
   neighbor fe80:ba82:77f0:f96d:7a85:a7fa:ef6f:37d2;
   interface "tnet-knot";
+  password "{{ bgp_password['coregonus-knot'] }}";
 }
diff --git a/tnet/templates/hash/bird-tnet.conf b/tnet/templates/hash/bird-tnet.conf
index a570291..d9c52b0 100644
--- a/tnet/templates/hash/bird-tnet.conf
+++ b/tnet/templates/hash/bird-tnet.conf
@@ -10,8 +10,6 @@ template bgp tnet_tpl {
 
   direct;
 
-  password "trygvis";
-
   ipv6 {
     next hop self;
     import filter {
@@ -40,6 +38,7 @@ template bgp tnet_tpl {
 protocol bgp tnet_conflatorio from tnet_tpl {
   neighbor fe80:4540:476c:d432:2f32:818b:811b:bb60;
   interface "tnet-confltrio";
+  password "{{ bgp_password['conflatorio-hash'] }}";
 
   rr client;
 }
@@ -47,6 +46,7 @@ protocol bgp tnet_conflatorio from tnet_tpl {
 protocol bgp tnet_knot from tnet_tpl {
   neighbor fe80:3b20:4cb0:5315:22a:c7de:a45b:8a7c;
   interface "tnet-knot";
+  password "{{ bgp_password['hash-knot'] }}";
 
   rr client;
 }
@@ -54,6 +54,7 @@ protocol bgp tnet_knot from tnet_tpl {
 protocol bgp tnet_lhn2pi from tnet_tpl {
   neighbor fe80:6195:1d43:9655:35f7:9dba:798c:26b9;
   interface "tnet-lhn2pi";
+  password "{{ bgp_password['hash-lhn2pi'] }}";
 
   rr client;
 }
@@ -61,6 +62,7 @@ protocol bgp tnet_lhn2pi from tnet_tpl {
 protocol bgp tnet_node1 from tnet_tpl {
   neighbor fe80:a026:6ec2:b356:21c5:b51:22b9:a1df;
   interface "tnet-node1";
+  password "{{ bgp_password['hash-node1'] }}";
 
   rr client;
 }
@@ -68,6 +70,7 @@ protocol bgp tnet_node1 from tnet_tpl {
 protocol bgp tnet_node2 from tnet_tpl {
   neighbor fe80:a7a6:c1a8:c261:232e:7d67:fc27:7c8d;
   interface "tnet-node2";
+  password "{{ bgp_password['hash-node2'] }}";
 
   rr client;
 }
diff --git a/tnet/templates/knot/bird-tnet.conf b/tnet/templates/knot/bird-tnet.conf
index f21be09..699c0f2 100644
--- a/tnet/templates/knot/bird-tnet.conf
+++ b/tnet/templates/knot/bird-tnet.conf
@@ -10,8 +10,6 @@ template bgp tnet_tpl {
 
   direct;
 
-  password "trygvis";
-
   ipv6 {
     next hop self;
     import filter {
@@ -40,6 +38,7 @@ template bgp tnet_tpl {
 protocol bgp tnet_conflatorio from tnet_tpl {
   neighbor fe80:47fc:660:b91f:1063:a6ae:46bb:7588;
   interface "tnet-confltrio";
+  password "{{ bgp_password['conflatorio-knot'] }}";
 
   rr client;
 }
@@ -47,6 +46,7 @@ protocol bgp tnet_conflatorio from tnet_tpl {
 protocol bgp tnet_coregonus from tnet_tpl {
   neighbor fe80:ba82:77f0:f96d:7a85:a7fa:ef6f:37d3;
   interface "tnet-coregonus";
+  password "{{ bgp_password['coregonus-knot'] }}";
 
   rr client;
 }
@@ -54,6 +54,7 @@ protocol bgp tnet_coregonus from tnet_tpl {
 protocol bgp tnet_hash from tnet_tpl {
   neighbor fe80:3b20:4cb0:5315:22a:c7de:a45b:8a7d;
   interface "tnet-hash";
+  password "{{ bgp_password['hash-knot'] }}";
 
   rr client;
 }
@@ -61,6 +62,7 @@ protocol bgp tnet_hash from tnet_tpl {
 protocol bgp tnet_kv24ix from tnet_tpl {
   neighbor fe80:fef1:078a:5b64:efd3:ae7b:d286:d7cf;
   interface "tnet-kv24ix";
+  password "{{ bgp_password['knot-kv24ix'] }}";
 
   rr client;
 }
@@ -68,6 +70,7 @@ protocol bgp tnet_kv24ix from tnet_tpl {
 protocol bgp tnet_lhn2pi from tnet_tpl {
   neighbor fe80:d83a:350b:2162:6eda:1cc1:9cd7:80e9;
   interface "tnet-lhn2pi";
+  password "{{ bgp_password['knot-lhn2pi'] }}";
 
   rr client;
 }
@@ -75,6 +78,7 @@ protocol bgp tnet_lhn2pi from tnet_tpl {
 protocol bgp tnet_node1 from tnet_tpl {
   neighbor fe80:58eb:3930:1815:2a6d:8918:70c9:96f3;
   interface "tnet-node1";
+  password "{{ bgp_password['knot-node1'] }}";
 
   rr client;
 }
@@ -82,6 +86,7 @@ protocol bgp tnet_node1 from tnet_tpl {
 protocol bgp tnet_node2 from tnet_tpl {
   neighbor fe80:9dd8:abac:cf05:aea3:dc03:4c74:32db;
   interface "tnet-node2";
+  password "{{ bgp_password['knot-node2'] }}";
 
   rr client;
 }
diff --git a/tnet/templates/lhn2pi/bird-tnet.conf b/tnet/templates/lhn2pi/bird-tnet.conf
index 9f0ef8c..f755c3b 100644
--- a/tnet/templates/lhn2pi/bird-tnet.conf
+++ b/tnet/templates/lhn2pi/bird-tnet.conf
@@ -10,8 +10,6 @@ template bgp tnet_tpl {
 
   direct;
 
-  password "trygvis";
-
   ipv6 {
     next hop self;
     import filter {
@@ -40,9 +38,11 @@ template bgp tnet_tpl {
 protocol bgp tnet_hash from tnet_tpl {
   neighbor fe80:6195:1d43:9655:35f7:9dba:798c:26b8;
   interface "tnet-hash";
+  password "{{ bgp_password['hash-lhn2pi'] }}";
 }
 
 protocol bgp tnet_knot from tnet_tpl {
   neighbor fe80:d83a:350b:2162:6eda:1cc1:9cd7:80e8;
   interface "tnet-knot";
+  password "{{ bgp_password['knot-lhn2pi'] }}";
 }
diff --git a/tnet/templates/node1/bird-tnet.conf b/tnet/templates/node1/bird-tnet.conf
index 6449582..bafb6de 100644
--- a/tnet/templates/node1/bird-tnet.conf
+++ b/tnet/templates/node1/bird-tnet.conf
@@ -10,8 +10,6 @@ template bgp tnet_tpl {
 
   direct;
 
-  password "trygvis";
-
   ipv6 {
     next hop self;
     import filter {
@@ -40,9 +38,11 @@ template bgp tnet_tpl {
 protocol bgp tnet_hash from tnet_tpl {
   neighbor fe80:a026:6ec2:b356:21c5:b51:22b9:a1de;
   interface "tnet-hash";
+  password "{{ bgp_password['hash-node1'] }}";
 }
 
 protocol bgp tnet_knot from tnet_tpl {
   neighbor fe80:58eb:3930:1815:2a6d:8918:70c9:96f2;
   interface "tnet-knot";
+  password "{{ bgp_password['knot-node1'] }}";
 }
diff --git a/tnet/templates/node2/bird-tnet.conf b/tnet/templates/node2/bird-tnet.conf
index b9a2294..8a7b887 100644
--- a/tnet/templates/node2/bird-tnet.conf
+++ b/tnet/templates/node2/bird-tnet.conf
@@ -10,8 +10,6 @@ template bgp tnet_tpl {
 
   direct;
 
-  password "trygvis";
-
   ipv6 {
     next hop self;
     import filter {
@@ -40,9 +38,11 @@ template bgp tnet_tpl {
 protocol bgp tnet_hash from tnet_tpl {
   neighbor fe80:a7a6:c1a8:c261:232e:7d67:fc27:7c8c;
   interface "tnet-hash";
+  password "{{ bgp_password['hash-node2'] }}";
 }
 
 protocol bgp tnet_knot from tnet_tpl {
   neighbor fe80:9dd8:abac:cf05:aea3:dc03:4c74:32da;
   interface "tnet-knot";
+  password "{{ bgp_password['knot-node2'] }}";
 }
-- 
cgit v1.2.3