summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorrbalocca <rbalocca@fugazi.vyatta.com>2007-11-27 12:47:06 -0800
committerrbalocca <rbalocca@fugazi.vyatta.com>2007-11-27 12:47:06 -0800
commitb1fd90f10917c28e25cca0eba1ec7d6200679bdc (patch)
tree539038bc351833126839f8e4ca9a275505e1c8c3 /templates
parentc095fa715a6fae2f6b36a8a27ad24e9f24788f5b (diff)
parent619cfac2cf37a21297dd1fb51116dc4ec30d4112 (diff)
downloadvyatta-cfg-system-b1fd90f10917c28e25cca0eba1ec7d6200679bdc.tar.gz
vyatta-cfg-system-b1fd90f10917c28e25cca0eba1ec7d6200679bdc.zip
Merge branch 'master' into glendale
Conflicts: scripts/install-system.in
Diffstat (limited to 'templates')
-rw-r--r--templates/interfaces/ethernet/node.tag/vrrp/node.def3
1 files changed, 2 insertions, 1 deletions
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/node.def b/templates/interfaces/ethernet/node.tag/vrrp/node.def
index 38622243..de3253a5 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/node.def
@@ -1,4 +1,5 @@
help: "Configure VRRP"
-commit: $(virtual-address/@) != ""; "must define the virtual-address"
+commit: $(../address/) != ""; "Must define a primary IP address on $(../@)"
+commit: $(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $(../vrrp-group/@)"
end: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action update --intf $(../@) "