summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@io.vyatta.com>2009-02-28 13:36:44 -0800
committerStig Thormodsrud <stig@io.vyatta.com>2009-02-28 13:36:44 -0800
commit0294f753e1b788b115ec75e660ef10212a0128b2 (patch)
tree4d7a2e6ba9be9040caad63c1c2e4c29f55b7a17c /templates
parent7775cbb1736fe6134be36674d49d2f3e6626e352 (diff)
downloadvyatta-cfg-quagga-0294f753e1b788b115ec75e660ef10212a0128b2.tar.gz
vyatta-cfg-quagga-0294f753e1b788b115ec75e660ef10212a0128b2.zip
Fix 3778: vrrp should allow prefix to be included with the virtual-address
Diffstat (limited to 'templates')
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def7
-rw-r--r--templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def7
2 files changed, 12 insertions, 2 deletions
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
index 64b7b21e..363240cd 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
@@ -1,6 +1,11 @@
multi:
-type: ipv4
+type: txt
help: Set virtual address
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-keepalived.pl \
+ --vrrp-action='check-vip' --vip='$VAR(@)' "\
+ ; "Invalid virtual-address [$VAR(@)] for vrrp-group $VAR(../@)"
+
comp_help: possible completions:
<x.x.x.x> Virtual IP address (up to 20 per group)
+ <x.x.x.x/x> Virtual IP address with prefix (up to 20 per group)
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
index 64b7b21e..363240cd 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
@@ -1,6 +1,11 @@
multi:
-type: ipv4
+type: txt
help: Set virtual address
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-keepalived.pl \
+ --vrrp-action='check-vip' --vip='$VAR(@)' "\
+ ; "Invalid virtual-address [$VAR(@)] for vrrp-group $VAR(../@)"
+
comp_help: possible completions:
<x.x.x.x> Virtual IP address (up to 20 per group)
+ <x.x.x.x/x> Virtual IP address with prefix (up to 20 per group)