diff options
| author | Bob Gilligan <gilligan@vyatta.com> | 2010-11-21 08:00:30 -0800 |
|---|---|---|
| committer | Bob Gilligan <gilligan@vyatta.com> | 2010-11-21 08:00:30 -0800 |
| commit | c62670948195185b44b2073edcda8b47409f3035 (patch) | |
| tree | 2241fd8cfe947b39d6d30979a9c6a5c9e4b39faf | |
| parent | 92f6f66814c0d9e9a82048ac99cf50d839678dc3 (diff) | |
| parent | 1905a4cefe161e83b1c35558d2354a6c9f987e3d (diff) | |
| download | vyatta-cfg-system-c62670948195185b44b2073edcda8b47409f3035.tar.gz vyatta-cfg-system-c62670948195185b44b2073edcda8b47409f3035.zip | |
Merge branch 'mendocino' of http://git.vyatta.com/vyatta-cfg-system into mendocino
5 files changed, 5 insertions, 9 deletions
diff --git a/scripts/vyatta-tunnel-cleanup b/scripts/vyatta-tunnel-cleanup index fdca80a3..41b34922 100644 --- a/scripts/vyatta-tunnel-cleanup +++ b/scripts/vyatta-tunnel-cleanup @@ -4,7 +4,7 @@ # the underlying tunnel link, if all tunnels of that type are gone. # Create map of encapsulations still in use -my $confg = new Vyatta::Config; +my $config = new Vyatta::Config; $config->setLevel("interfaces tunnel"); my %tunnel; foreach my $tun ($config->listNodes()) { 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 |