diff options
4 files changed, 32 insertions, 8 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 676bf8d3..4d29ce94 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 @@ -1,9 +1,15 @@ multi: -type: ipv4,ipv4net +type: txt help: Virtual address [REQUIRED] syntax:expression: exec " - if [[ '$VAR(@)' == '*/' ]]; then /opt/vyatta/sbin/valid_address $VAR(@); fi" + if echo '$VAR(@)' | grep -q '/' ; then \ + /opt/vyatta/sbin/valid_address $VAR(@) ; \ + else \ + /opt/vyatta/sbin/valid_address $VAR(@)/32 ; \ + fi" val_help: ipv4; Virtual IP address (up to 20 per group) val_help: ipv4net; Virtual IP address with prefix (up to 20 per group) +val_help: ipv6; Virtual IPv6 address (up to 20 per group) +val_help: ipv6net; Virtual IPv6 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 676bf8d3..4d29ce94 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 @@ -1,9 +1,15 @@ multi: -type: ipv4,ipv4net +type: txt help: Virtual address [REQUIRED] syntax:expression: exec " - if [[ '$VAR(@)' == '*/' ]]; then /opt/vyatta/sbin/valid_address $VAR(@); fi" + if echo '$VAR(@)' | grep -q '/' ; then \ + /opt/vyatta/sbin/valid_address $VAR(@) ; \ + else \ + /opt/vyatta/sbin/valid_address $VAR(@)/32 ; \ + fi" val_help: ipv4; Virtual IP address (up to 20 per group) val_help: ipv4net; Virtual IP address with prefix (up to 20 per group) +val_help: ipv6; Virtual IPv6 address (up to 20 per group) +val_help: ipv6net; Virtual IPv6 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 676bf8d3..4d29ce94 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,9 +1,15 @@ multi: -type: ipv4,ipv4net +type: txt help: Virtual address [REQUIRED] syntax:expression: exec " - if [[ '$VAR(@)' == '*/' ]]; then /opt/vyatta/sbin/valid_address $VAR(@); fi" + if echo '$VAR(@)' | grep -q '/' ; then \ + /opt/vyatta/sbin/valid_address $VAR(@) ; \ + else \ + /opt/vyatta/sbin/valid_address $VAR(@)/32 ; \ + fi" val_help: ipv4; Virtual IP address (up to 20 per group) val_help: ipv4net; Virtual IP address with prefix (up to 20 per group) +val_help: ipv6; Virtual IPv6 address (up to 20 per group) +val_help: ipv6net; Virtual IPv6 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 676bf8d3..4d29ce94 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,9 +1,15 @@ multi: -type: ipv4,ipv4net +type: txt help: Virtual address [REQUIRED] syntax:expression: exec " - if [[ '$VAR(@)' == '*/' ]]; then /opt/vyatta/sbin/valid_address $VAR(@); fi" + if echo '$VAR(@)' | grep -q '/' ; then \ + /opt/vyatta/sbin/valid_address $VAR(@) ; \ + else \ + /opt/vyatta/sbin/valid_address $VAR(@)/32 ; \ + fi" val_help: ipv4; Virtual IP address (up to 20 per group) val_help: ipv4net; Virtual IP address with prefix (up to 20 per group) +val_help: ipv6; Virtual IPv6 address (up to 20 per group) +val_help: ipv6net; Virtual IPv6 address with prefix (up to 20 per group) |