summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-10-04 22:25:19 +0200
committerChristian Poessinger <christian@poessinger.com>2021-10-04 22:25:19 +0200
commit74a8c4b42b5ad31cdf34ddea07f83f7bff86be87 (patch)
tree7ae69d25b1c58a9e8b500c1629924b8fdac1fdf1 /data
parentb7189cd1df327621a304ca65626a517223db6432 (diff)
downloadvyos-1x-74a8c4b42b5ad31cdf34ddea07f83f7bff86be87.tar.gz
vyos-1x-74a8c4b42b5ad31cdf34ddea07f83f7bff86be87.zip
bgp: T3741: "parameter default no-ipv4-unicast" is now a default option
Diffstat (limited to 'data')
-rw-r--r--data/templates/frr/bgpd.frr.tmpl2
1 files changed, 0 insertions, 2 deletions
diff --git a/data/templates/frr/bgpd.frr.tmpl b/data/templates/frr/bgpd.frr.tmpl
index 27a2b98a5..a35930c93 100644
--- a/data/templates/frr/bgpd.frr.tmpl
+++ b/data/templates/frr/bgpd.frr.tmpl
@@ -230,10 +230,8 @@ router bgp {{ local_as }} {{ 'vrf ' ~ vrf if vrf is defined and vrf is not none
{% else %}
no bgp ebgp-requires-policy
{% endif %}
-{% if parameters is defined and parameters.default is defined and parameters.default.no_ipv4_unicast is defined %}
{# Option must be set before any neighbor - see https://phabricator.vyos.net/T3463 #}
no bgp default ipv4-unicast
-{% endif %}
{# Workaround for T2100 until we have decided about a migration script #}
no bgp network import-check
{% if address_family is defined and address_family is not none %}