From bd70243ef64ce9f87631b928a054698afbd24709 Mon Sep 17 00:00:00 2001 From: Ruben Herold Date: Sun, 23 Feb 2020 20:55:38 +0100 Subject: T1301: remove check to fix peer-groups with no-ipv4-unicast (cherry picked from commit 7d01291bfe5305e53807f17b629b0e2763ebf120) --- scripts/bgp/vyatta-bgp.pl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'scripts/bgp/vyatta-bgp.pl') diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl index 5d182318..8bea2848 100755 --- a/scripts/bgp/vyatta-bgp.pl +++ b/scripts/bgp/vyatta-bgp.pl @@ -1540,10 +1540,7 @@ sub check_neighbor_parameters if ($config->exists("$as neighbor $neighbor peer-group") || $config->exists("$as neighbor $neighbor interface peer-group") || $config->exists("$as neighbor $neighbor interface v6only peer-group")) { - if ($config->exists("$as parameters default no-ipv4-unicast") && $config->exists("$as neighbor $neighbor peer-group")) { - die "[ protocols bgp $as neighbor $neighbor ]\n peer-group defined but ipv4-unicast is disabled\n"; - } - $peergroup = $config->returnValue("$as neighbor $neighbor peer-group"); + $peergroup = $config->returnValue("$as neighbor $neighbor peer-group"); if (! defined($peergroup)) { $peergroup = $config->returnValue("$as neighbor $neighbor interface peer-group"); } -- cgit v1.2.3