8 files changed, 32 insertions, 7 deletions
diff --git a/tnet/files/hash/bird.conf b/tnet/files/hash/bird.conf
index 8cf210a..16ce2cc 100644
--- a/tnet/files/hash/bird.conf
+++ b/tnet/files/hash/bird.conf
@@ -3,7 +3,6 @@ template bgp tnet_tpl {
   neighbor internal;
 
   direct;
-  rr client;
 
   password "trygvis";
 
@@ -31,19 +30,27 @@ template bgp tnet_tpl {
 protocol bgp tnet_astyanax from tnet_tpl {
   neighbor fe80:a0fd:89e4:42c6:f617:7398:abf4:b517;
   interface "tnet-astyanax";
+
+  rr client;
 }
 
 protocol bgp tnet_knot from tnet_tpl {
   neighbor fe80:3b20:4cb0:5315:22a:c7de:a45b:8a7c;
   interface "tnet-knot";
+
+  rr client;
 }
 
 protocol bgp tnet_node1 from tnet_tpl {
   neighbor fe80:a026:6ec2:b356:21c5:b51:22b9:a1df;
   interface "tnet-node1";
+
+  rr client;
 }
 
 protocol bgp tnet_node2 from tnet_tpl {
   neighbor fe80:a7a6:c1a8:c261:232e:7d67:fc27:7c8d;
   interface "tnet-node2";
+
+  rr client;
 }
diff --git a/tnet/files/knot/bird.conf b/tnet/files/knot/bird.conf
index cb70e94..fcecc19 100644
--- a/tnet/files/knot/bird.conf
+++ b/tnet/files/knot/bird.conf
@@ -3,7 +3,6 @@ template bgp tnet_tpl {
   neighbor internal;
 
   direct;
-  rr client;
 
   password "trygvis";
 
@@ -31,9 +30,20 @@ template bgp tnet_tpl {
 protocol bgp tnet_hash from tnet_tpl {
   neighbor fe80:3b20:4cb0:5315:22a:c7de:a45b:8a7d;
   interface "tnet-hash";
+
+  rr client;
 }
 
 protocol bgp tnet_node1 from tnet_tpl {
   neighbor fe80:58eb:3930:1815:2a6d:8918:70c9:96f3;
   interface "tnet-node1";
+
+  rr client;
+}
+
+protocol bgp tnet_node2 from tnet_tpl {
+  neighbor fe80:9dd8:abac:cf05:aea3:dc03:4c74:32db;
+  interface "tnet-node2";
+
+  rr client;
 }
diff --git a/tnet/files/node1/bird.conf b/tnet/files/node1/bird.conf
index 1ac0335..88bd6f8 100644
--- a/tnet/files/node1/bird.conf
+++ b/tnet/files/node1/bird.conf
@@ -3,7 +3,6 @@ template bgp tnet_tpl {
   neighbor internal;
 
   direct;
-  rr client;
 
   password "trygvis";
 
diff --git a/tnet/files/node2/bird.conf b/tnet/files/node2/bird.conf
index e1f1898..99dfc5e 100644
--- a/tnet/files/node2/bird.conf
+++ b/tnet/files/node2/bird.conf
@@ -3,7 +3,6 @@ template bgp tnet_tpl {
   neighbor internal;
 
   direct;
-  rr client;
 
   password "trygvis";
 
diff --git a/tnet/host_vars/hash/bird.yml b/tnet/host_vars/hash/bird.yml
index 9176312..17cb4cd 100644
--- a/tnet/host_vars/hash/bird.yml
+++ b/tnet/host_vars/hash/bird.yml
@@ -1,5 +1,9 @@
 tnet_bird_peers:
+  astyanax:
+    rr_client: true
   knot:
+    rr_client: true
   node1:
+    rr_client: true
   node2:
-  astyanax:
+    rr_client: true
diff --git a/tnet/host_vars/knot/bird.yml b/tnet/host_vars/knot/bird.yml
index e8b20e7..0c1d73b 100644
--- a/tnet/host_vars/knot/bird.yml
+++ b/tnet/host_vars/knot/bird.yml
@@ -1,3 +1,7 @@
 tnet_bird_peers:
   hash:
+    rr_client: true
   node1:
+    rr_client: true
+  node2:
+    rr_client: true
diff --git a/tnet/host_vars/kv24ix/bird.yml b/tnet/host_vars/kv24ix/bird.yml
index b59526c..e20c45a 100644
--- a/tnet/host_vars/kv24ix/bird.yml
+++ b/tnet/host_vars/kv24ix/bird.yml
@@ -1,3 +1,2 @@
 tnet_bird_peers:
-  hash:
   knot:
diff --git a/tnet/templates/bird.conf.j2 b/tnet/templates/bird.conf.j2
index 45dc318..57e557a 100644
--- a/tnet/templates/bird.conf.j2
+++ b/tnet/templates/bird.conf.j2
@@ -3,7 +3,6 @@ template bgp tnet_tpl {
   neighbor internal;
 
   direct;
-  rr client;
 
   password "trygvis";
 
@@ -32,5 +31,9 @@ template bgp tnet_tpl {
 protocol bgp tnet_{{ p }} from tnet_tpl {
   neighbor {{ hostvars[p].tnet_wg[inventory_hostname].address }};
   interface "tnet-{{ p }}";
+{% if tnet_bird_peers[p].rr_client|default(False) %}
+
+  rr client;
+{% endif %}
 }
 {% endfor %}