summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-06-16 17:02:52 +0200
committerChristian Poessinger <christian@poessinger.com>2019-06-16 17:02:52 +0200
commitcfc5f4220407d6fd4f9b637850b5db39ce197be9 (patch)
tree5ea797d64950d79a38449445ef0a0377195e27b2 /scripts
parent24971edeadf9874e9dfe93221a22f6f05d9048dc (diff)
downloadvyatta-cfg-quagga-cfc5f4220407d6fd4f9b637850b5db39ce197be9.tar.gz
vyatta-cfg-quagga-cfc5f4220407d6fd4f9b637850b5db39ce197be9.zip
Revert "T849: move BGP peer-group node to ipv4 address family"
This reverts commit 890c9e8984c6b4eeef7ee277c88777416e1fb340.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/bgp/vyatta-bgp.pl12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl
index 331f41ed..2a3ca514 100755
--- a/scripts/bgp/vyatta-bgp.pl
+++ b/scripts/bgp/vyatta-bgp.pl
@@ -575,6 +575,11 @@ my %qcom = (
set => 'router bgp #3 ; neighbor #5 password #7',
del => 'router bgp #3 ; no neighbor #5 password',
},
+ 'protocols bgp var neighbor var peer-group' => {
+ set => 'router bgp #3 ; neighbor #5 peer-group #7',
+ del => 'router bgp #3 ; no neighbor #5 peer-group #7',
+ noerr => 'del',
+ },
'protocols bgp var neighbor var port' => {
set => 'router bgp #3 ; neighbor #5 port #7',
del => 'router bgp #3 ; no neighbor #5 port',
@@ -944,7 +949,7 @@ my %qcom = (
set => 'router bgp #3 ; address-family ipv4 unicast ; neighbor #5 capability orf prefix-list send',
del => 'router bgp #3 ; address-family ipv4 unicast ; no neighbor #5 capability orf prefix-list send',
},
- ## Note that the activate will need to be moved when we migrate to
+ ## Note that the activate will need to be moved when we migrate to
## supporting a single IP version in a peering session.
'protocols bgp var peer-group var address-family ipv4-unicast default-originate' => {
set => 'router bgp #3 ; address-family ipv4 unicast ; neighbor #5 activate ; neighbor #5 default-originate',
@@ -954,11 +959,6 @@ my %qcom = (
set => 'router bgp #3 ; address-family ipv4 unicast ; neighbor #5 activate ; neighbor #5 default-originate route-map #10',
del => 'router bgp #3 ; address-family ipv4 unicast ; no neighbor #5 default-originate route-map #10',
},
- 'protocols bgp var peer-group var address-family ipv4-unicast peer-group' => {
- set => 'router bgp #3 ; address-family ipv4 unicast ; neighbor #5 peer-group #7',
- del => 'router bgp #3 ; address-family ipv4 unicast ; no neighbor #5 peer-group #7',
- noerr => 'del',
- },
'protocols bgp var peer-group var address-family ipv4-unicast disable-send-community' => {
set => undef,
del => undef,