From 0edd928ec8fed048823222829deed2d3ebbfddc7 Mon Sep 17 00:00:00 2001
From: Tobias Hachmer <tobias@hachmer.de>
Date: Sun, 17 Sep 2017 14:53:06 +0200
Subject: [PATCH] Role service-bird-ffrl: correct ipaddr filters

---
 roles/service-bird-ffrl/templates/ffrl_ipv4_peers.conf.j2 | 2 +-
 roles/service-bird-ffrl/templates/ffrl_ipv6.conf.j2       | 2 +-
 roles/service-bird-ffrl/templates/ffrl_ipv6_peers.conf.j2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/service-bird-ffrl/templates/ffrl_ipv4_peers.conf.j2 b/roles/service-bird-ffrl/templates/ffrl_ipv4_peers.conf.j2
index da21eb1..d646e33 100644
--- a/roles/service-bird-ffrl/templates/ffrl_ipv4_peers.conf.j2
+++ b/roles/service-bird-ffrl/templates/ffrl_ipv4_peers.conf.j2
@@ -3,7 +3,7 @@
 #
 
 {% for peer_id, peer_value in ffrl_exit_server.iteritems() %}
-protocol bgp {{ peer_id }} from ffrl_uplink {
+protocol bgp '{{ peer_id }}' from ffrl_uplink {
     source address {{ peer_value.tunnel_ipv4_address | ipaddr('address') }};
     neighbor {{ peer_value.tunnel_ipv4_network | ipaddr('address') }} as ffrl_as;
 };
diff --git a/roles/service-bird-ffrl/templates/ffrl_ipv6.conf.j2 b/roles/service-bird-ffrl/templates/ffrl_ipv6.conf.j2
index 05541fd..42feffc 100644
--- a/roles/service-bird-ffrl/templates/ffrl_ipv6.conf.j2
+++ b/roles/service-bird-ffrl/templates/ffrl_ipv6.conf.j2
@@ -43,7 +43,7 @@ protocol static ffrl_public_routes {
 {% for mesh_id, mesh_value in meshes.iteritems() %}
 {% for prefix in mesh_value.ipv6.public %}
     route {{ prefix }} reject;
-    route {{ prefix | ipaddr('net') | ipsubnet(56, magic) | ipaddr('network') }} reject;
+    route {{ prefix | ipaddr('net') | ipsubnet(56, magic) | ipaddr('network/prefix') }} reject;
 {% endfor %}
 {% endfor %}
 }
diff --git a/roles/service-bird-ffrl/templates/ffrl_ipv6_peers.conf.j2 b/roles/service-bird-ffrl/templates/ffrl_ipv6_peers.conf.j2
index 98e776c..ef495ed 100644
--- a/roles/service-bird-ffrl/templates/ffrl_ipv6_peers.conf.j2
+++ b/roles/service-bird-ffrl/templates/ffrl_ipv6_peers.conf.j2
@@ -3,7 +3,7 @@
 #
 
 {% for peer_id, peer_value in ffrl_exit_server.iteritems() %}
-protocol bgp {{ peer_id }} from ffrl_uplink {
+protocol bgp '{{ peer_id }}' from ffrl_uplink {
     source address {{ peer_value.tunnel_ipv6_network | ipaddr('net') | ipaddr('2') | ipaddr('address') }};
     neighbor {{ peer_value.tunnel_ipv6_network | ipaddr('net') | ipaddr('1') | ipaddr('address') }} as ffrl_as;
 };