summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2009-10-30 19:47:48 -0700
committerStig Thormodsrud <stig@vyatta.com>2009-10-30 19:47:48 -0700
commitab9152164d1f89ce91e4318b72cc5deb2ac0084b (patch)
treef4211a1a3e3708f5d8ea23331341f9436da2d6bc /templates
parent5f20b6a1b3e63903eb9e80fbd081335ebe641e28 (diff)
downloadvyatta-cfg-quagga-ab9152164d1f89ce91e4318b72cc5deb2ac0084b.tar.gz
vyatta-cfg-quagga-ab9152164d1f89ce91e4318b72cc5deb2ac0084b.zip
Partial fix for 4984: Configuring an IP of a local interface as a bgp neighbor results in an out of sync condition between the vyatta config and the bgpd config
- still need vtysh to exit non-zero.
Diffstat (limited to 'templates')
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def7
1 files changed, 4 insertions, 3 deletions
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
index 10804af4..27c725e0 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
@@ -1,6 +1,7 @@
type: u32
help: Set neighbor BGP AS number
-comp_help:
+
+comp_help: possible completions:
<1-4294967294> AS number
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; \
@@ -9,7 +10,7 @@ syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; \
# Create action so this leaf is done before others
create: vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../@)" \
- -c "neighbor $VAR(../@) remote-as $VAR(@)";
+ -c "neighbor $VAR(../@) remote-as $VAR(@)" || exit 1;
if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@)
then
vyatta-vtysh -c "configure terminal" \
@@ -21,7 +22,7 @@ create: vyatta-vtysh -c "configure terminal" \
update: vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../@)" \
- -c "neighbor $VAR(../@) remote-as $VAR(@)";
+ -c "neighbor $VAR(../@) remote-as $VAR(@)" || exit 1;
if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@)
then
vyatta-vtysh -c "configure terminal" \