diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-11-22 16:39:16 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-11-22 16:39:16 -0800 |
| commit | ec786d590f2ca9cb48e0992b9118f29c39b71683 (patch) | |
| tree | 25a944a3859364a58d57180828da74092835f103 | |
| parent | f3503c4909b9ca8d383e49259b762824cda3fd41 (diff) | |
| download | vyatta-cfg-quagga-ec786d590f2ca9cb48e0992b9118f29c39b71683.tar.gz vyatta-cfg-quagga-ec786d590f2ca9cb48e0992b9118f29c39b71683.zip | |
Bonding should have same VRRP rules as Ethernet
4 files changed, 4 insertions, 8 deletions
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/node.def index 47aceb53..6abc6f89 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/node.def @@ -1,5 +1,3 @@ -help: Configure Virtual Router Redundancy Protocol (VRRP) parameters - +help: Virtual Router Redundancy Protocol (VRRP) parameters priority: 800 - end:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action update --intf $VAR(../../@).$VAR(../@) " diff --git a/templates/interfaces/bonding/node.tag/vrrp/node.def b/templates/interfaces/bonding/node.tag/vrrp/node.def index adeb0564..a9224ed9 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/node.def @@ -1,5 +1,3 @@ -help: Configure Virtual Router Redundancy Protocol (VRRP) - +help: Virtual Router Redundancy Protocol (VRRP) priority: 800 - end:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action update --intf $VAR(../@) " diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def index 9c6a8b17..0458fd0d 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def @@ -1,7 +1,7 @@ tag: type: u32 help: VRRP group number -syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "VRRP group must be between 1-255" +syntax:expression: $VAR(@) > 0 && $VAR(@) <= 255; "VRRP group must be between 1-255" val_help: u32:1-255; VRRP group number commit:expression: $VAR(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $VAR(@)" diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def index 920c59d1..88684dd8 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def @@ -1,4 +1,4 @@ type: u32 -syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255" +syntax:expression: $VAR(@) > 0 &&$VAR(@) <= 255; "priority must be between 1-255" help: Priority val_help: u32:1-255; Priority |