diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2010-02-18 20:50:47 -0800 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2010-02-18 20:50:47 -0800 |
| commit | a1700ddb2f778b04218482a9815f6f1104090ee3 (patch) | |
| tree | e19019364621cd8a9f01a313ce01a4b454b4c44c /templates | |
| parent | af437c91eb2aa15e8d3964183679f10af0416045 (diff) | |
| download | vyatta-cfg-quagga-a1700ddb2f778b04218482a9815f6f1104090ee3.tar.gz vyatta-cfg-quagga-a1700ddb2f778b04218482a9815f6f1104090ee3.zip | |
BGP IPv6 peer route-map fails on boot-up.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def | 10 | ||||
| -rw-r--r-- | templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def | 20 |
2 files changed, 15 insertions, 15 deletions
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def index ac48274e..20fe9b2b 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def @@ -18,11 +18,11 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then fi; if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@) then - vyatta-vtysh -c "configure terminal" \ - -c "router bgp $VAR(../../../@)" \ - -c "address-family ipv6" \ - -c "neighbor $VAR(../../@) $peer" \ - -c "address-family ipv6" \ + vyatta-vtysh -c "configure terminal" \ + -c "router bgp $VAR(../../../@)" \ + -c "neighbor $VAR(../../@) $peer" \ + -c "address-family ipv6" \ + -c "neighbor $VAR(../../@) activate" \ -c "neighbor $VAR(../../@) route-map $VAR(@) out" else vyatta-vtysh -c "configure terminal" \ diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def index 69c6e055..10157986 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def @@ -11,25 +11,27 @@ commit:expression: $VAR(../../peer-group/) == ""; "protocols bgp $VAR(../../../@ commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../@) neighbor $VAR(../../@) import: route-map $VAR(@) doesn't exist" -update: if [ -n "$VAR(../../remote-as/@)" ]; then +update: if [ -n "$VAR(../../remote-as/@)" ]; + then peer="remote-as $VAR(../../remote-as/@)"; else peer="peer-group $VAR(../../peer-group/@)"; fi; + if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@) then - vyatta-vtysh -c "configure terminal" \ - -c "router bgp $VAR(../../../@)" \ - -c "address-family ipv6" \ - -c "neighbor $VAR(../../@) $peer" \ - -c "address-family ipv6" \ + vyatta-vtysh -c "configure terminal" \ + -c "router bgp $VAR(../../../@)" \ + -c "neighbor $VAR(../../@) $peer" \ + -c "address-family ipv6" \ + -c "neighbor $VAR(../../@) activate" \ -c "neighbor $VAR(../../@) route-map $VAR(@) in" else vyatta-vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "neighbor $VAR(../../@) $peer" \ -c "neighbor $VAR(../../@) route-map $VAR(@) in" - fi + fi; delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@) then @@ -41,9 +43,7 @@ delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@) vyatta-vtysh -c "configure terminal" \ -c "router bgp $VAR(../../../@)" \ -c "no neighbor $VAR(../../@) route-map $VAR(@) in" - fi - - + fi; comp_help: possible completions: <txt> route-map name |