summaryrefslogtreecommitdiff
path: root/data/templates/frr
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-02-27 13:19:36 +0100
committerGitHub <noreply@github.com>2021-02-27 13:19:36 +0100
commitbf9c9146ba56c994985d33ac8f93f2378bc1d5cc (patch)
treeb754d527aaee1795e86a008774a537ca18e3ceeb /data/templates/frr
parent1c8280bd894331d76867ed80e95866a6e0b921b6 (diff)
parent95d769d6614fcb7b84c3f0b6e848c92fe09356b5 (diff)
downloadvyos-1x-bf9c9146ba56c994985d33ac8f93f2378bc1d5cc.tar.gz
vyos-1x-bf9c9146ba56c994985d33ac8f93f2378bc1d5cc.zip
Merge pull request #752 from sever-sever/T3365
bgp: T3365: Fix remote-as ordering for neighbor
Diffstat (limited to 'data/templates/frr')
-rw-r--r--data/templates/frr/bgp.frr.tmpl6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/templates/frr/bgp.frr.tmpl b/data/templates/frr/bgp.frr.tmpl
index 43e405222..4a4d2449c 100644
--- a/data/templates/frr/bgp.frr.tmpl
+++ b/data/templates/frr/bgp.frr.tmpl
@@ -9,6 +9,9 @@
{% if config.remote_as is defined and config.remote_as is not none %}
neighbor {{ neighbor }} remote-as {{ config.remote_as }}
{% endif %}
+{% if config.interface.remote_as is defined and config.interface.remote_as is not none %}
+ neighbor {{ neighbor }} interface remote-as {{ config.interface.remote_as }}
+{% endif %}
{% if config.advertisement_interval is defined and config.advertisement_interval is not none %}
neighbor {{ neighbor }} advertisement-interval {{ config.advertisement_interval }}
{% endif %}
@@ -73,9 +76,6 @@
{% if config.interface.peer_group is defined and config.interface.peer_group is not none %}
neighbor {{ neighbor }} interface peer-group {{ config.interface.peer_group }}
{% endif %}
-{% if config.interface.remote_as is defined and config.interface.remote_as is not none %}
- neighbor {{ neighbor }} interface remote-as {{ config.interface.remote_as }}
-{% endif %}
{% if config.interface.v6only is defined and config.interface.v6only is not none %}
{% if config.interface.v6only.peer_group is defined and config.interface.v6only.peer_group is not none %}
neighbor {{ neighbor }} interface v6only peer-group {{ config.interface.v6only.peer_group }}