1 files changed, 21 insertions, 4 deletions
diff --git a/data/templates/frr/bgpd.frr.j2 b/data/templates/frr/bgpd.frr.j2
index 5febd7c66..7bd9efdce 100644
--- a/data/templates/frr/bgpd.frr.j2
+++ b/data/templates/frr/bgpd.frr.j2
@@ -9,6 +9,11 @@
 {% if config.remote_as is vyos_defined %}
  neighbor {{ neighbor }} remote-as {{ config.remote_as }}
 {% endif %}
+{% if config.local_role is vyos_defined %}
+{%     for role, strict in config.local_role.items() %}
+ neighbor {{ neighbor }} local-role {{ role }} {{ 'strict-mode' if strict }}
+{%     endfor %}
+{% endif %}
 {% if config.interface.remote_as is vyos_defined %}
  neighbor {{ neighbor }} interface remote-as {{ config.interface.remote_as }}
 {% endif %}
@@ -69,6 +74,9 @@
 {% if config.password is vyos_defined %}
  neighbor {{ neighbor }} password {{ config.password }}
 {% endif %}
+{% if config.path_attribute.discard is vyos_defined %}
+ neighbor {{ neighbor }} path-attribute discard {{ config.path_attribute.discard }}
+{% endif %}
 {% if config.port is vyos_defined %}
  neighbor {{ neighbor }} port {{ config.port }}
 {% endif %}
@@ -240,7 +248,7 @@ router bgp {{ system_as }} {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
 {% else %}
  no bgp ebgp-requires-policy
 {% endif %}
-{#   Option must be set before any neighbor - see https://phabricator.vyos.net/T3463 #}
+{#   Option must be set before any neighbor - see https://vyos.dev/T3463 #}
  no bgp default ipv4-unicast
 {# Workaround for T2100 until we have decided about a migration script #}
  no bgp network import-check
@@ -411,13 +419,19 @@ router bgp {{ system_as }} {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
    rd {{ vni_config.rd }}
 {%                 endif %}
 {%                 if vni_config.route_target.both is vyos_defined %}
-   route-target both {{ vni_config.route_target.both }}
+{%                     for route_target in vni_config.route_target.both %}
+   route-target both {{ route_target }}
+{%                     endfor %}
 {%                 endif %}
 {%                 if vni_config.route_target.export is vyos_defined %}
-   route-target export {{ vni_config.route_target.export }}
+{%                     for route_target in vni_config.route_target.export %}
+   route-target export {{ route_target }}
+{%                     endfor %}
 {%                 endif %}
 {%                 if vni_config.route_target.import is vyos_defined %}
-   route-target import {{ vni_config.route_target.import }}
+{%                     for route_target in vni_config.route_target.import %}
+   route-target import {{ route_target }}
+{%                     endfor %}
 {%                 endif %}
   exit-vni
 {%             endfor %}
@@ -541,6 +555,9 @@ bgp route-reflector allow-outbound-policy
 {% if parameters.suppress_fib_pending is vyos_defined %}
  bgp suppress-fib-pending
 {% endif %}
+{% if parameters.tcp_keepalive.idle is vyos_defined and parameters.tcp_keepalive.interval is vyos_defined and parameters.tcp_keepalive.probes is vyos_defined %}
+ bgp tcp-keepalive {{ parameters.tcp_keepalive.idle }} {{ parameters.tcp_keepalive.interval }} {{ parameters.tcp_keepalive.probes }}
+{% endif %}
 {% if timers.keepalive is vyos_defined and timers.holdtime is vyos_defined %}
  timers bgp {{ timers.keepalive }} {{ timers.holdtime }}
 {% endif %}