diff options
| author | Daniil Baturin <daniil@vyos.io> | 2020-02-24 03:42:19 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-24 03:42:19 +0700 |
| commit | cee68343fba90b0703e806fd3c5c93d74853ec52 (patch) | |
| tree | ec73a7c6815c430894db2c095bb5ee8a1cee4dc9 | |
| parent | 1a13654cbab4101f343d3522d99d96227e14a867 (diff) | |
| parent | 7d01291bfe5305e53807f17b629b0e2763ebf120 (diff) | |
| download | vyatta-cfg-quagga-cee68343fba90b0703e806fd3c5c93d74853ec52.tar.gz vyatta-cfg-quagga-cee68343fba90b0703e806fd3c5c93d74853ec52.zip | |
Merge pull request #43 from ruben-herold/T1301
T1301: remove check to fix peer-groups with no-ipv4-unicast
| -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 78697a47..359eb972 100755 --- a/scripts/bgp/vyatta-bgp.pl +++ b/scripts/bgp/vyatta-bgp.pl @@ -1552,10 +1552,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"); } |