diff options
| author | Ruben Herold <ruben@insecure.pw> | 2020-02-23 20:55:38 +0100 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2020-03-19 13:16:50 -0500 |
| commit | bd70243ef64ce9f87631b928a054698afbd24709 (patch) | |
| tree | 27cc9d714be09ec2c1afe27519c5f77d57be8f42 /scripts/bgp/vyatta-bgp.pl | |
| parent | a199725042c2da5ac4d72729f1cf3d85f40c9fde (diff) | |
| download | vyatta-cfg-quagga-bd70243ef64ce9f87631b928a054698afbd24709.tar.gz vyatta-cfg-quagga-bd70243ef64ce9f87631b928a054698afbd24709.zip | |
T1301: remove check to fix peer-groups with no-ipv4-unicast
(cherry picked from commit 7d01291bfe5305e53807f17b629b0e2763ebf120)
Diffstat (limited to 'scripts/bgp/vyatta-bgp.pl')
| -rwxr-xr-x | scripts/bgp/vyatta-bgp.pl | 5 |
1 files changed, 1 insertions, 4 deletions
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"); } |