summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-02-26 22:49:44 +0100
committerGitHub <noreply@github.com>2021-02-26 22:49:44 +0100
commit6342735d51ee057a55d7fb9f2a53ff0dfaa1febf (patch)
treed5c905c590ad6567c63d38124dca507fa1a7b15d /data
parentcaf6e392f025139f962395d162b433a4d038eeee (diff)
parent4bf55f9732dd44d2297d70c0587604df90a39757 (diff)
downloadvyos-1x-6342735d51ee057a55d7fb9f2a53ff0dfaa1febf.tar.gz
vyos-1x-6342735d51ee057a55d7fb9f2a53ff0dfaa1febf.zip
Merge pull request #744 from Cheeze-It/current
bgp: T2100: Changing RFC8212 behavior and option toggle
Diffstat (limited to 'data')
-rw-r--r--data/templates/frr/bgp.frr.tmpl6
1 files changed, 4 insertions, 2 deletions
diff --git a/data/templates/frr/bgp.frr.tmpl b/data/templates/frr/bgp.frr.tmpl
index 30741aa27..43e405222 100644
--- a/data/templates/frr/bgp.frr.tmpl
+++ b/data/templates/frr/bgp.frr.tmpl
@@ -186,9 +186,11 @@
{% endmacro %}
!
router bgp {{ asn }}
-{# Disable eBGP policy by default until there is a CLI option #}
-{# Workaround for T3183 until we have decided about a migration script #}
+{% if parameters is defined and parameters.ebgp_requires_policy is defined %}
+ bgp ebgp-requires-policy
+{% else %}
no bgp ebgp-requires-policy
+{% 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 %}