summaryrefslogtreecommitdiff
path: root/data/templates
diff options
context:
space:
mode:
authorsever-sever <v.gletenko@vyos.io>2021-02-27 11:15:44 +0000
committersever-sever <v.gletenko@vyos.io>2021-02-27 11:15:44 +0000
commit95d769d6614fcb7b84c3f0b6e848c92fe09356b5 (patch)
tree6230c3c23728ce70f8c104ee5877fa19a29030b6 /data/templates
parentcf8df2f3995d553e87257a6a748905f888d97941 (diff)
downloadvyos-1x-95d769d6614fcb7b84c3f0b6e848c92fe09356b5.tar.gz
vyos-1x-95d769d6614fcb7b84c3f0b6e848c92fe09356b5.zip
bgp: T3365: Fix remote-as ordering for neighbor
Diffstat (limited to 'data/templates')
-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 }}