From 307c8ebbd6b291cbedbe213067dd7683283746a9 Mon Sep 17 00:00:00 2001 From: Taoyu Li Date: Fri, 26 Oct 2018 22:14:52 +0000 Subject: [PATCH 1/2] [zebra.conf] Avoid zebra crash upon empty configuration --- dockers/docker-fpm-quagga/zebra.conf.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dockers/docker-fpm-quagga/zebra.conf.j2 b/dockers/docker-fpm-quagga/zebra.conf.j2 index e4586e72dd62..052c14b382f6 100644 --- a/dockers/docker-fpm-quagga/zebra.conf.j2 +++ b/dockers/docker-fpm-quagga/zebra.conf.j2 @@ -52,9 +52,11 @@ ip route 0.0.0.0/0 {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} 200 {% endfor %} {% endif %} ! Set ip source to loopback for bgp learned routes +{% if lo_ipv4_addrs|length > 0 %} route-map RM_SET_SRC permit 10 set src {{ lo_ipv4_addrs[0] | ip }} ! +{% endif %} {% if lo_ipv6_addrs|length > 0 %} route-map RM_SET_SRC6 permit 10 set src {{ lo_ipv6_addrs[0] | ip }} From 94273635e5ea1faee8c510b23df3b63fe3ccd7ba Mon Sep 17 00:00:00 2001 From: Taoyu Li Date: Fri, 26 Oct 2018 22:44:35 +0000 Subject: [PATCH 2/2] Fix space difference --- dockers/docker-fpm-quagga/zebra.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/docker-fpm-quagga/zebra.conf.j2 b/dockers/docker-fpm-quagga/zebra.conf.j2 index 052c14b382f6..4acb474b0e35 100644 --- a/dockers/docker-fpm-quagga/zebra.conf.j2 +++ b/dockers/docker-fpm-quagga/zebra.conf.j2 @@ -52,7 +52,7 @@ ip route 0.0.0.0/0 {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} 200 {% endfor %} {% endif %} ! Set ip source to loopback for bgp learned routes -{% if lo_ipv4_addrs|length > 0 %} +{% if lo_ipv4_addrs|length > 0 -%} route-map RM_SET_SRC permit 10 set src {{ lo_ipv4_addrs[0] | ip }} !