diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-10-06 20:54:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-06 20:54:32 +0200 |
| commit | d21b01246a6ef01e407f62cb908e625462fbdc40 (patch) | |
| tree | b3a1d3e2cf39530af6a9e79149c7ceb75b309b18 /data | |
| parent | 7bffb45f931f91416000a483c77e6749ced71206 (diff) | |
| parent | bc73a4f7452434f25119267129f337640d8a959c (diff) | |
| download | vyos-1x-d21b01246a6ef01e407f62cb908e625462fbdc40.tar.gz vyos-1x-d21b01246a6ef01e407f62cb908e625462fbdc40.zip | |
Merge pull request #4778 from jestabro/revert-bgp-remove-per-vrf-system-as
Revert "bgp: T7760: remove per vrf instance system-as node"
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/frr/bgpd.frr.j2 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/data/templates/frr/bgpd.frr.j2 b/data/templates/frr/bgpd.frr.j2 index 169487dbd..e5a75090f 100644 --- a/data/templates/frr/bgpd.frr.j2 +++ b/data/templates/frr/bgpd.frr.j2 @@ -259,11 +259,7 @@ {# j2lint: disable=jinja-statements-delimeter #} {%- endmacro -%} ! -{% if vrf is vyos_defined %} - router bgp {{ dependent_vrfs.default.protocols.bgp.system_as }} vrf {{ vrf }} -{% else %} - router bgp {{ system_as }} -{% endif %} +router bgp {{ system_as }} {{ 'vrf ' ~ vrf if vrf is vyos_defined }} {% if parameters.ebgp_requires_policy is vyos_defined %} bgp ebgp-requires-policy {% else %} |