summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorRobert Bays <robert@vyatta.com>2010-07-14 17:42:36 -0700
committerRobert Bays <robert@vyatta.com>2010-07-14 17:42:36 -0700
commit092a5ca5ddcbbb6eaad95c7f266fdd9f6baa2fa5 (patch)
tree72f548c7f1f956b1e2bd6a7d8acfcbd985c845cc /templates
parent64033f5ce454ea0eb53f6b67b04bc7e6d330f149 (diff)
parentf9ddb65ae8eacca7e5fa0314a474b608fcfd34ce (diff)
downloadvyatta-cfg-quagga-092a5ca5ddcbbb6eaad95c7f266fdd9f6baa2fa5.tar.gz
vyatta-cfg-quagga-092a5ca5ddcbbb6eaad95c7f266fdd9f6baa2fa5.zip
Merge branch 'larkspur' of http://git.vyatta.com/vyatta-cfg-quagga into larkspur
Diffstat (limited to 'templates')
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def1
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def7
2 files changed, 1 insertions, 7 deletions
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def
index 2cfa6fe6..8a89fc4c 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def
@@ -3,4 +3,3 @@ help: Allow this EBGP neighbor to not be on a directly connected network
comp_help: possible completions:
<1-255> number of hops
syntax:expression: $VAR(@) >=1 && $VAR(@) <= 255; "ebgp-multihop must be between 1 and 255"
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --not-exists \"protocols bgp $VAR(../../@) neighbor $VAR(../@) ttl-security\" "; "protocols bgp $VAR(../../@) neighbor $VAR(../@) ebgp-multihop: you can't set both ebgp-multihop and ttl-security"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def
index f8127f10..4ac20c35 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def
@@ -1,7 +1,2 @@
-type: u32
help: Set ttl security mechanism for this BGP peer
-comp_help: possible completions:
- <1-254> maximum number of hops that separate two peers
-syntax:expression: $VAR(@) >=1 && $VAR(@) <= 254 ; \
- "ttl-security must be between 1 and 254"
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --not-exists \"protocols bgp $VAR(../../@) neighbor $VAR(../@) ebgp-multihop\" "; "protocols bgp $VAR(../../@) neighbor $VAR(../@) ttl-security: you can't set both ebgp-multihop and ttl-security"
+