From 21042962d4b3c6ddcd646fe2664a2637c89e8836 Mon Sep 17 00:00:00 2001
From: Jesper Hess Nielsen <jesper@graffen.dk>
Date: Tue, 21 Apr 2020 15:41:48 +0200
Subject: [PATCH] Add frb1.cph.dk.routers.v6.hessnet.dk

---
 ansible.cfg                                   |  1 +
 .../frb1.cph.dk.routers.v6.hessnet.dk.yml     | 26 +++++++++++++++++++
 roles/bird/templates/bird.conf.j2             |  2 +-
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 host_vars/frb1.cph.dk.routers.v6.hessnet.dk.yml

diff --git a/ansible.cfg b/ansible.cfg
index 3856460..0f57fe0 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,6 +1,7 @@
 [defaults]
 inventory = inventory
 interpreter_python = auto_silent
+vault_password_file = ~/vault_password
 
 [privilege_escalation]
 become = True
diff --git a/host_vars/frb1.cph.dk.routers.v6.hessnet.dk.yml b/host_vars/frb1.cph.dk.routers.v6.hessnet.dk.yml
new file mode 100644
index 0000000..6e7dd72
--- /dev/null
+++ b/host_vars/frb1.cph.dk.routers.v6.hessnet.dk.yml
@@ -0,0 +1,26 @@
+---
+router_id: "185.38.175.78"
+router_v4_ip: "185.38.175.78"
+router_v6_ip: "2a01:4262:1ab:20::78"
+
+bgp_peers:
+  - name: "labitat_v4"
+    template: "transit_v4"
+    peer_asn: "205235"
+    neighbor_ip: "185.38.175.65"
+    
+  - name: "labitat_v6"
+    template: "transit_v6"
+    peer_asn: "205235"
+    neighbor_ip: "2a01:4262:1ab:20::1"
+
+  - name: "hessnet_home"
+    template: "peer_hessnet"
+    peer_asn: "209616"
+    neighbor_ip: "2001:678:15c:a00::1"
+    filters:
+      export: "{ peer_export_default_only(); }"
+      import: "myroutes_import_export"
+
+announce_from_here: true
+configure_static_multihop_routes: false
diff --git a/roles/bird/templates/bird.conf.j2 b/roles/bird/templates/bird.conf.j2
index 7611370..eb49beb 100644
--- a/roles/bird/templates/bird.conf.j2
+++ b/roles/bird/templates/bird.conf.j2
@@ -235,7 +235,7 @@ template bgp peer_hessnet {
 
 {% for peer in bgp_peers %}
 protocol bgp {{ peer.name }} from {{ peer.template }} {
-	neighbor {{peer.neighbor_ip}} as {{peer.asn}};
+	neighbor {{peer.neighbor_ip}} as {{peer.peer_asn}};
 {% if peer.password is defined %}
 	password "{{ peer.password }}";
 {% endif %}