summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-04-02 18:50:52 +0200
committerGitHub <noreply@github.com>2024-04-02 18:50:52 +0200
commit2831bec9c1d94f5382140e937ccae11fb345eefd (patch)
tree0851498ef529f5c17055d5e6839a8de0aec581a4 /data
parent92be9ee46943f38648daeb75da729a460daea9c9 (diff)
parent372bb5c160daf9c5c6688f783903fab26f37a75d (diff)
downloadvyos-1x-2831bec9c1d94f5382140e937ccae11fb345eefd.tar.gz
vyos-1x-2831bec9c1d94f5382140e937ccae11fb345eefd.zip
Merge pull request #3233 from vyos/mergify/bp/sagitta/pr-3232
T6196: Fixed applying parameters for aggregation in BGP (backport #3232)
Diffstat (limited to 'data')
-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 %}