summaryrefslogtreecommitdiff
path: root/data/templates
diff options
context:
space:
mode:
authoraapostoliuk <a.apostoliuk@vyos.io>2024-04-02 17:42:06 +0300
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-04-02 16:29:58 +0000
commit372bb5c160daf9c5c6688f783903fab26f37a75d (patch)
treefcb726fe8fd58fafd77bf007eec1fa0ef45f5c00 /data/templates
parent0cb21915164551b3d2eaab79ed6339184957c326 (diff)
downloadvyos-1x-372bb5c160daf9c5c6688f783903fab26f37a75d.tar.gz
vyos-1x-372bb5c160daf9c5c6688f783903fab26f37a75d.zip
T6196: Fixed applying parameters for aggregation in BGP
Fixed using 'route-map', 'as-set' and 'summary-only' together in aggregation in BGP (cherry picked from commit d8df8339d665db58afbf20cecaeb49ac9d1b617d)
Diffstat (limited to 'data/templates')
-rw-r--r--data/templates/frr/bgpd.frr.j25
1 files changed, 1 insertions, 4 deletions
diff --git a/data/templates/frr/bgpd.frr.j2 b/data/templates/frr/bgpd.frr.j2
index 7d1241f5a..e5bfad59d 100644
--- a/data/templates/frr/bgpd.frr.j2
+++ b/data/templates/frr/bgpd.frr.j2
@@ -290,10 +290,7 @@ router bgp {{ system_as }} {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
{% endif %}
{% if afi_config.aggregate_address is vyos_defined %}
{% for aggregate, aggregate_config in afi_config.aggregate_address.items() %}
- aggregate-address {{ aggregate }}{{ ' as-set' if aggregate_config.as_set is vyos_defined }}{{ ' summary-only' if aggregate_config.summary_only is vyos_defined }}
-{% if aggregate_config.route_map is vyos_defined %}
- aggregate-address {{ aggregate }} route-map {{ aggregate_config.route_map }}
-{% endif %}
+ aggregate-address {{ aggregate }} {{ 'as-set' if aggregate_config.as_set is vyos_defined }} {{ 'summary-only' if aggregate_config.summary_only is vyos_defined }} {{ 'route-map ' ~ aggregate_config.route_map if aggregate_config.route_map is vyos_defined }}
{% endfor %}
{% endif %}
{% if afi_config.maximum_paths.ebgp is vyos_defined %}