1 files changed, 6 insertions, 2 deletions
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;