summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Bays <robert@vyatta.com>2011-09-27 13:43:03 -0700
committerRobert Bays <robert@vyatta.com>2011-09-27 13:43:03 -0700
commit685ccfa94c8ea711125ed7ea37444c6f1f025ee9 (patch)
tree319ec77310099fdf3aa07f059e922dc77aae361b
parentc071d7a30040bcd57174acd63e701f010aa12d9f (diff)
downloadvyatta-cfg-quagga-685ccfa94c8ea711125ed7ea37444c6f1f025ee9.tar.gz
vyatta-cfg-quagga-685ccfa94c8ea711125ed7ea37444c6f1f025ee9.zip
Bug 7522 -
bgp: allow default-originate if default ipv4 disable
-rwxr-xr-xscripts/bgp/vyatta-bgp.pl6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl
index 56bfe978..bc1bab0b 100755
--- a/scripts/bgp/vyatta-bgp.pl
+++ b/scripts/bgp/vyatta-bgp.pl
@@ -849,12 +849,14 @@ my %qcom = (
set => 'router bgp #3 ; neighbor #5 capability orf prefix-list send',
del => 'router bgp #3 ; no neighbor #5 capability orf prefix-list send',
},
+ ## 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 default-originate' => {
- set => 'router bgp #3 ; neighbor #5 default-originate',
+ set => 'router bgp #3 ; neighbor #5 activate ; neighbor #5 default-originate',
del => 'router bgp #3 ; no neighbor #5 default-originate',
},
'protocols bgp var peer-group var default-originate route-map' => {
- set => 'router bgp #3 ; neighbor #5 default-originate route-map #8',
+ set => 'router bgp #3 ; neighbor #5 activate ; neighbor #5 default-originate route-map #8',
del => 'router bgp #3 ; no neighbor #5 default-originate route-map #8',
},
'protocols bgp var peer-group var disable-capability-negotiation' => {