diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-11-23 16:15:57 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-11-23 16:44:54 -0800 |
| commit | ce0724444cca9f005925786d8523832e10357430 (patch) | |
| tree | 94d08f9886ff3a48ce0ea494e2e429d4d9951544 /templates | |
| parent | 01d4c9c6e8c5e7b20ff1bd7372417b086af8f301 (diff) | |
| download | vyatta-cfg-system-ce0724444cca9f005925786d8523832e10357430.tar.gz vyatta-cfg-system-ce0724444cca9f005925786d8523832e10357430.zip | |
Remove check function from keepalived perl script
No longer need check-vip option since the type checking is done
in template
Diffstat (limited to 'templates')
4 files changed, 0 insertions, 16 deletions
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def index d86675ec..676bf8d3 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def @@ -5,9 +5,5 @@ help: Virtual address [REQUIRED] syntax:expression: exec " if [[ '$VAR(@)' == '*/' ]]; then /opt/vyatta/sbin/valid_address $VAR(@); fi" -syntax:expression: exec "/opt/vyatta/sbin/vyatta-keepalived.pl \ - --vrrp-action='check-vip' --vip='$VAR(@)' "\ - ; "Invalid virtual-address [$VAR(@)] for vrrp-group $VAR(../@)" - val_help: ipv4; Virtual IP address (up to 20 per group) val_help: ipv4net; Virtual IP address with prefix (up to 20 per group) diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def index d86675ec..676bf8d3 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def @@ -5,9 +5,5 @@ help: Virtual address [REQUIRED] syntax:expression: exec " if [[ '$VAR(@)' == '*/' ]]; then /opt/vyatta/sbin/valid_address $VAR(@); fi" -syntax:expression: exec "/opt/vyatta/sbin/vyatta-keepalived.pl \ - --vrrp-action='check-vip' --vip='$VAR(@)' "\ - ; "Invalid virtual-address [$VAR(@)] for vrrp-group $VAR(../@)" - val_help: ipv4; Virtual IP address (up to 20 per group) val_help: ipv4net; Virtual IP address with prefix (up to 20 per group) 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 d86675ec..676bf8d3 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 @@ -5,9 +5,5 @@ help: Virtual address [REQUIRED] syntax:expression: exec " if [[ '$VAR(@)' == '*/' ]]; then /opt/vyatta/sbin/valid_address $VAR(@); fi" -syntax:expression: exec "/opt/vyatta/sbin/vyatta-keepalived.pl \ - --vrrp-action='check-vip' --vip='$VAR(@)' "\ - ; "Invalid virtual-address [$VAR(@)] for vrrp-group $VAR(../@)" - val_help: ipv4; Virtual IP address (up to 20 per group) val_help: ipv4net; 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 d86675ec..676bf8d3 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 @@ -5,9 +5,5 @@ help: Virtual address [REQUIRED] syntax:expression: exec " if [[ '$VAR(@)' == '*/' ]]; then /opt/vyatta/sbin/valid_address $VAR(@); fi" -syntax:expression: exec "/opt/vyatta/sbin/vyatta-keepalived.pl \ - --vrrp-action='check-vip' --vip='$VAR(@)' "\ - ; "Invalid virtual-address [$VAR(@)] for vrrp-group $VAR(../@)" - val_help: ipv4; Virtual IP address (up to 20 per group) val_help: ipv4net; Virtual IP address with prefix (up to 20 per group) |