From bb41d406f8491e89691595bb7bd3cfe7f2fcd1d1 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 10 Jul 2024 16:57:08 +0200 Subject: [PATCH] =?UTF-8?q?exit,=20firewall:=20don=E2=80=99t=20hardcode=20?= =?UTF-8?q?prefix=20length?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roles/exit/templates/frr.conf.j2 | 4 ++-- roles/firewall/templates/frr.conf.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/exit/templates/frr.conf.j2 b/roles/exit/templates/frr.conf.j2 index ed10bbf..556bd4e 100644 --- a/roles/exit/templates/frr.conf.j2 +++ b/roles/exit/templates/frr.conf.j2 @@ -217,9 +217,9 @@ ipv6 prefix-list fabric permit 2001:1470:fffd:3400::/64 ge 128 | selectattr('vrf.id', 'in', inside_vrfs|map(attribute='id')) | sort(attribute='family.value') | sort(attribute='vlan.vid') %} {% if prefix.family.value == 4 %} -ip prefix-list office permit {{ prefix.prefix }} ge 24 +ip prefix-list office permit {{ prefix.prefix }} ge {{ prefix.prefix | ipaddr('prefix') }} {% else %} -ipv6 prefix-list office permit {{ prefix.prefix }} ge 64 +ipv6 prefix-list office permit {{ prefix.prefix }} ge {{ prefix.prefix | ipaddr('prefix') }} {% endif %} {% endfor %} diff --git a/roles/firewall/templates/frr.conf.j2 b/roles/firewall/templates/frr.conf.j2 index 324ec23..4172131 100644 --- a/roles/firewall/templates/frr.conf.j2 +++ b/roles/firewall/templates/frr.conf.j2 @@ -85,9 +85,9 @@ ip prefix-list fabric permit 10.34.0.0/24 ge 32 {% for prefix in vrf_prefixes | rejectattr('vrf.name', '==', 'outside') | sort(attribute='family.value') %} {% if prefix.family.value == 4 %} -ip prefix-list office permit {{ prefix.prefix }} ge 24 +ip prefix-list office permit {{ prefix.prefix }} ge {{ prefix.prefix | ipaddr('prefix') }} {% elif prefix.family.value == 6 %} -ipv6 prefix-list office permit {{ prefix.prefix }} ge 64 +ipv6 prefix-list office permit {{ prefix.prefix }} ge {{ prefix.prefix | ipaddr('prefix') }} {% endif %} {% endfor %}