From c43ac111560888ef0393aecbd54202f1a8b7b9fc Mon Sep 17 00:00:00 2001 From: John Southworth Date: Tue, 15 May 2012 13:52:52 -0700 Subject: Move VRRP to its own package --- .../interfaces/bonding/node.tag/vif/node.tag/vrrp/node.def | 3 --- .../bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.def | 7 ------- .../vrrp/vrrp-group/node.tag/advertise-interval/node.def | 5 ----- .../node.tag/vrrp/vrrp-group/node.tag/authentication/node.def | 1 - .../vrrp/vrrp-group/node.tag/authentication/password/node.def | 5 ----- .../vrrp/vrrp-group/node.tag/authentication/type/node.def | 7 ------- .../node.tag/vrrp/vrrp-group/node.tag/description/node.def | 2 -- .../vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def | 1 - .../vrrp/vrrp-group/node.tag/hello-source-address/node.def | 5 ----- .../vrrp/vrrp-group/node.tag/interface/description/node.def | 10 ---------- .../vif/node.tag/vrrp/vrrp-group/node.tag/interface/node.def | 1 - .../node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def | 5 ----- .../vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def | 3 --- .../vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def | 4 ---- .../node.tag/run-transition-scripts/backup/node.def | 5 ----- .../vrrp-group/node.tag/run-transition-scripts/fault/node.def | 5 ----- .../node.tag/run-transition-scripts/master/node.def | 5 ----- .../vrrp/vrrp-group/node.tag/run-transition-scripts/node.def | 2 -- .../vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def | 2 -- .../vrrp/vrrp-group/node.tag/virtual-address/node.def | 9 --------- templates/interfaces/bonding/node.tag/vrrp/node.def | 3 --- .../interfaces/bonding/node.tag/vrrp/vrrp-group/node.def | 7 ------- .../vrrp/vrrp-group/node.tag/advertise-interval/node.def | 5 ----- .../node.tag/vrrp/vrrp-group/node.tag/authentication/node.def | 1 - .../vrrp/vrrp-group/node.tag/authentication/password/node.def | 5 ----- .../vrrp/vrrp-group/node.tag/authentication/type/node.def | 7 ------- .../node.tag/vrrp/vrrp-group/node.tag/description/node.def | 2 -- .../node.tag/vrrp/vrrp-group/node.tag/disable/node.def | 1 - .../vrrp/vrrp-group/node.tag/hello-source-address/node.def | 5 ----- .../vrrp/vrrp-group/node.tag/interface/description/node.def | 9 --------- .../node.tag/vrrp/vrrp-group/node.tag/interface/node.def | 1 - .../node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def | 5 ----- .../node.tag/vrrp/vrrp-group/node.tag/preempt/node.def | 3 --- .../node.tag/vrrp/vrrp-group/node.tag/priority/node.def | 4 ---- .../node.tag/run-transition-scripts/backup/node.def | 5 ----- .../vrrp-group/node.tag/run-transition-scripts/fault/node.def | 5 ----- .../node.tag/run-transition-scripts/master/node.def | 5 ----- .../vrrp/vrrp-group/node.tag/run-transition-scripts/node.def | 2 -- .../node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def | 2 -- .../vrrp/vrrp-group/node.tag/virtual-address/node.def | 9 --------- .../interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def | 3 --- .../ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.def | 7 ------- .../vrrp/vrrp-group/node.tag/advertise-interval/node.def | 5 ----- .../node.tag/vrrp/vrrp-group/node.tag/authentication/node.def | 1 - .../vrrp/vrrp-group/node.tag/authentication/password/node.def | 5 ----- .../vrrp/vrrp-group/node.tag/authentication/type/node.def | 7 ------- .../node.tag/vrrp/vrrp-group/node.tag/description/node.def | 2 -- .../vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def | 1 - .../vrrp/vrrp-group/node.tag/hello-source-address/node.def | 5 ----- .../vrrp/vrrp-group/node.tag/interface/description/node.def | 10 ---------- .../vif/node.tag/vrrp/vrrp-group/node.tag/interface/node.def | 1 - .../node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def | 5 ----- .../vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def | 3 --- .../vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def | 4 ---- .../node.tag/run-transition-scripts/backup/node.def | 5 ----- .../vrrp-group/node.tag/run-transition-scripts/fault/node.def | 5 ----- .../node.tag/run-transition-scripts/master/node.def | 5 ----- .../vrrp/vrrp-group/node.tag/run-transition-scripts/node.def | 2 -- .../vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def | 2 -- .../vrrp/vrrp-group/node.tag/virtual-address/node.def | 9 --------- templates/interfaces/ethernet/node.tag/vrrp/node.def | 11 ----------- .../interfaces/ethernet/node.tag/vrrp/vrrp-group/node.def | 7 ------- .../vrrp/vrrp-group/node.tag/advertise-interval/node.def | 5 ----- .../node.tag/vrrp/vrrp-group/node.tag/authentication/node.def | 1 - .../vrrp/vrrp-group/node.tag/authentication/password/node.def | 5 ----- .../vrrp/vrrp-group/node.tag/authentication/type/node.def | 7 ------- .../node.tag/vrrp/vrrp-group/node.tag/description/node.def | 2 -- .../node.tag/vrrp/vrrp-group/node.tag/disable/node.def | 1 - .../vrrp/vrrp-group/node.tag/hello-source-address/node.def | 5 ----- .../vrrp/vrrp-group/node.tag/interface/description/node.def | 9 --------- .../node.tag/vrrp/vrrp-group/node.tag/interface/node.def | 1 - .../node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def | 5 ----- .../node.tag/vrrp/vrrp-group/node.tag/preempt/node.def | 3 --- .../node.tag/vrrp/vrrp-group/node.tag/priority/node.def | 4 ---- .../node.tag/run-transition-scripts/backup/node.def | 5 ----- .../vrrp-group/node.tag/run-transition-scripts/fault/node.def | 5 ----- .../node.tag/run-transition-scripts/master/node.def | 5 ----- .../vrrp/vrrp-group/node.tag/run-transition-scripts/node.def | 2 -- .../node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def | 2 -- .../vrrp/vrrp-group/node.tag/virtual-address/node.def | 9 --------- 80 files changed, 354 deletions(-) delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/description/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/disable/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/interface/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def delete mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/description/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/disable/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/interface/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/priority/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def (limited to 'templates') 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 deleted file mode 100644 index 6abc6f89..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/node.def +++ /dev/null @@ -1,3 +0,0 @@ -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/vif/node.tag/vrrp/vrrp-group/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.def deleted file mode 100644 index b3126b2b..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.def +++ /dev/null @@ -1,7 +0,0 @@ -tag: -type: u32 -help: VRRP group number -syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "VRRP group must be between 1-255" -val_help: u32:1-255; VRRP group number - -delete:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action delete --intf $VAR(../../../@).$VAR(../../@) --group $VAR(@) " diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def deleted file mode 100644 index b9c113cc..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: u32 -default: 1 -help: Advertise interval -syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Advertise interval must be between 1-255" -val_help: u32:1-255; Advertise interval (default 1) diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def deleted file mode 100644 index 180851c4..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Authentication diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def deleted file mode 100644 index 072a2148..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: txt -help: Password -syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,8}$"; - "Password must be 8 characters or less" -val_help: Password (8 characters or less) diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def deleted file mode 100644 index 556c7f35..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def +++ /dev/null @@ -1,7 +0,0 @@ -type: txt -help: Authentication type -syntax:expression: $VAR(@) in "plaintext-password", "ah"; \ - "authentication must be plaintext-password or ah" -allowed: echo plaintext-password ah -val_help: plaintext-password; Plain text password mode -val_help: ah; IP Authentication Header mode diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def deleted file mode 100644 index 849e5273..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: txt -help: Description diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def deleted file mode 100644 index a0e0c576..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Disable VRRP group diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def deleted file mode 100644 index d8077a51..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: ipv4 - -help: Hello source address - -val_help: Source address for vrrp hello packets (optional) diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def deleted file mode 100644 index a0f78074..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def +++ /dev/null @@ -1,10 +0,0 @@ -priority: 820 # after vrrp -type: txt - -syntax:expression: pattern $VAR(@) "^.{1,256}$" \ - ; "interface description is too long (limit 256 characters)" - -help: Description for this interface -update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../../../../../@).$VAR(../../../../@)v$VAR(../../@)/ifalias" -delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../../../../../@).$VAR(../../../../@)v$VAR(../../@)/ifalias" - diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/node.def deleted file mode 100644 index 03f22d28..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Configure a virtual MAC interface diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def deleted file mode 100644 index 72f4c33d..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: u32 -syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 1000; \ - "preempt-delay must be between 0-1000" -help: Preempt delay -val_help: u32:0-1000; Preempt Delay in seconds diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def deleted file mode 100644 index baa3aee9..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def +++ /dev/null @@ -1,3 +0,0 @@ -type: bool -help: Preempt mode -default: true diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def deleted file mode 100644 index 920c59d1..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255" -help: Priority -val_help: u32:1-255; Priority diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def deleted file mode 100644 index 12006ee6..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def +++ /dev/null @@ -1,5 +0,0 @@ -help: Script to run on VRRP state-transition to backup -type: txt -syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Backup Script should be an existing executable" -syntax:expression: exec "/opt/vyatta/sbin/check_file_in_config_dir $VAR(@) '/config/scripts'" -val_help: Script in /config/scripts diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def deleted file mode 100644 index f2065249..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def +++ /dev/null @@ -1,5 +0,0 @@ -help: Script to run on VRRP state-transition to fault -type: txt -syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Fault Script should be an existing executable" -syntax:expression: exec "/opt/vyatta/sbin/check_file_in_config_dir $VAR(@) '/config/scripts'" -val_help: Script in /config/scripts diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def deleted file mode 100644 index d87909b7..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def +++ /dev/null @@ -1,5 +0,0 @@ -help: Script to run on VRRP state-transition to master -type: txt -syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Master Script should be an existing executable" -syntax:expression: exec "/opt/vyatta/sbin/check_file_in_config_dir $VAR(@) '/config/scripts'" -val_help: Script in /config/scripts diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def deleted file mode 100644 index 6d195d07..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: scripts to run on VRRP state-transitions - diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def deleted file mode 100644 index a7d2e1fd..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: txt -help: Add this vrrp group to a sync group 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 deleted file mode 100644 index 676bf8d3..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def +++ /dev/null @@ -1,9 +0,0 @@ -multi: -type: ipv4,ipv4net -help: Virtual address [REQUIRED] - -syntax:expression: exec " - if [[ '$VAR(@)' == '*/' ]]; then /opt/vyatta/sbin/valid_address $VAR(@); 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) diff --git a/templates/interfaces/bonding/node.tag/vrrp/node.def b/templates/interfaces/bonding/node.tag/vrrp/node.def deleted file mode 100644 index a9224ed9..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/node.def +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 00b87c19..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def +++ /dev/null @@ -1,7 +0,0 @@ -tag: -type: u32 -help: VRRP group number -syntax:expression: $VAR(@) > 0 && $VAR(@) <= 255; "VRRP group must be between 1-255" -val_help: u32:1-255; VRRP group number - -delete:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action delete --intf $VAR(../../@) --group $VAR(@) " diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def deleted file mode 100644 index b9c113cc..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: u32 -default: 1 -help: Advertise interval -syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Advertise interval must be between 1-255" -val_help: u32:1-255; Advertise interval (default 1) diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def deleted file mode 100644 index 180851c4..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Authentication diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def deleted file mode 100644 index 072a2148..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: txt -help: Password -syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,8}$"; - "Password must be 8 characters or less" -val_help: Password (8 characters or less) diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def deleted file mode 100644 index 556c7f35..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def +++ /dev/null @@ -1,7 +0,0 @@ -type: txt -help: Authentication type -syntax:expression: $VAR(@) in "plaintext-password", "ah"; \ - "authentication must be plaintext-password or ah" -allowed: echo plaintext-password ah -val_help: plaintext-password; Plain text password mode -val_help: ah; IP Authentication Header mode diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/description/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/description/node.def deleted file mode 100644 index 849e5273..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/description/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: txt -help: Description diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/disable/node.def deleted file mode 100644 index 93e4cc3e..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/disable/node.def +++ /dev/null @@ -1 +0,0 @@ -help: VRRP group disabled diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def deleted file mode 100644 index d8077a51..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: ipv4 - -help: Hello source address - -val_help: Source address for vrrp hello packets (optional) diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def deleted file mode 100644 index df48a57b..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def +++ /dev/null @@ -1,9 +0,0 @@ -priority: 820 # after vrrp -type: txt - -syntax:expression: pattern $VAR(@) "^.{1,256}$" \ - ; "interface description is too long (limit 256 characters)" - -help: Description for this interface -update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../../../../@)v$VAR(../../@)/ifalias" -delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../../../../@)v$VAR(../../@)/ifalias" diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/interface/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/interface/node.def deleted file mode 100644 index 03f22d28..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/interface/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Configure a virtual MAC interface diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def deleted file mode 100644 index 72f4c33d..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: u32 -syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 1000; \ - "preempt-delay must be between 0-1000" -help: Preempt delay -val_help: u32:0-1000; Preempt Delay in seconds diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def deleted file mode 100644 index baa3aee9..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def +++ /dev/null @@ -1,3 +0,0 @@ -type: bool -help: Preempt mode -default: true 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 deleted file mode 100644 index 88684dd8..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -syntax:expression: $VAR(@) > 0 &&$VAR(@) <= 255; "priority must be between 1-255" -help: Priority -val_help: u32:1-255; Priority diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def deleted file mode 100644 index 5c319e53..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def +++ /dev/null @@ -1,5 +0,0 @@ -help: Script to run on VRRP state-transition to backup -type: txt -syntax:expression: exec "[ -x $(echo $VAR(@) | awk -F ' ' '{ print $1 }') ] || exit 1"; "Backup script should be an existing executable" -syntax:expression: exec "/opt/vyatta/sbin/check_file_in_config_dir $(echo $VAR(@) | awk -F ' ' '{ print $1 }') '/config/scripts'" -val_help: Script in /config/scripts diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def deleted file mode 100644 index 3d43c2f8..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def +++ /dev/null @@ -1,5 +0,0 @@ -help: Script to run on VRRP state-transition to fault -type: txt -syntax:expression: exec "[ -x $(echo $VAR(@) | awk -F ' ' '{ print $1 }') ] || exit 1"; "Fault script should be an existing executable" -syntax:expression: exec "/opt/vyatta/sbin/check_file_in_config_dir $(echo $VAR(@) | awk -F ' ' '{ print $1 }') '/config/scripts'" -val_help: Script in /config/scripts diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def deleted file mode 100644 index 80b1613c..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def +++ /dev/null @@ -1,5 +0,0 @@ -help: Script to run on VRRP state-transition to master -type: txt -syntax:expression: exec "[ -x $(echo $VAR(@) | awk -F ' ' '{ print $1 }') ] || exit 1"; "Master script should be an existing executable" -syntax:expression: exec "/opt/vyatta/sbin/check_file_in_config_dir $(echo $VAR(@) | awk -F ' ' '{ print $1 }') '/config/scripts'" -val_help: Script in /config/scripts diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def deleted file mode 100644 index 6d3a6c11..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Scripts for VRRP state-transitions - diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def deleted file mode 100644 index a7d2e1fd..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: txt -help: Add this vrrp group to a sync 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 deleted file mode 100644 index 676bf8d3..00000000 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def +++ /dev/null @@ -1,9 +0,0 @@ -multi: -type: ipv4,ipv4net -help: Virtual address [REQUIRED] - -syntax:expression: exec " - if [[ '$VAR(@)' == '*/' ]]; then /opt/vyatta/sbin/valid_address $VAR(@); 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) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def deleted file mode 100644 index 6abc6f89..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def +++ /dev/null @@ -1,3 +0,0 @@ -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/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.def deleted file mode 100644 index b3126b2b..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.def +++ /dev/null @@ -1,7 +0,0 @@ -tag: -type: u32 -help: VRRP group number -syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "VRRP group must be between 1-255" -val_help: u32:1-255; VRRP group number - -delete:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action delete --intf $VAR(../../../@).$VAR(../../@) --group $VAR(@) " diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def deleted file mode 100644 index b9c113cc..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: u32 -default: 1 -help: Advertise interval -syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Advertise interval must be between 1-255" -val_help: u32:1-255; Advertise interval (default 1) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def deleted file mode 100644 index 180851c4..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Authentication diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def deleted file mode 100644 index 072a2148..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: txt -help: Password -syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,8}$"; - "Password must be 8 characters or less" -val_help: Password (8 characters or less) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def deleted file mode 100644 index 556c7f35..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def +++ /dev/null @@ -1,7 +0,0 @@ -type: txt -help: Authentication type -syntax:expression: $VAR(@) in "plaintext-password", "ah"; \ - "authentication must be plaintext-password or ah" -allowed: echo plaintext-password ah -val_help: plaintext-password; Plain text password mode -val_help: ah; IP Authentication Header mode diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def deleted file mode 100644 index 849e5273..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: txt -help: Description diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def deleted file mode 100644 index a0e0c576..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Disable VRRP group diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def deleted file mode 100644 index d8077a51..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: ipv4 - -help: Hello source address - -val_help: Source address for vrrp hello packets (optional) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def deleted file mode 100644 index a0f78074..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def +++ /dev/null @@ -1,10 +0,0 @@ -priority: 820 # after vrrp -type: txt - -syntax:expression: pattern $VAR(@) "^.{1,256}$" \ - ; "interface description is too long (limit 256 characters)" - -help: Description for this interface -update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../../../../../@).$VAR(../../../../@)v$VAR(../../@)/ifalias" -delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../../../../../@).$VAR(../../../../@)v$VAR(../../@)/ifalias" - diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/node.def deleted file mode 100644 index 03f22d28..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Configure a virtual MAC interface diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def deleted file mode 100644 index 72f4c33d..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: u32 -syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 1000; \ - "preempt-delay must be between 0-1000" -help: Preempt delay -val_help: u32:0-1000; Preempt Delay in seconds diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def deleted file mode 100644 index baa3aee9..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def +++ /dev/null @@ -1,3 +0,0 @@ -type: bool -help: Preempt mode -default: true diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def deleted file mode 100644 index 920c59d1..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255" -help: Priority -val_help: u32:1-255; Priority diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def deleted file mode 100644 index 12006ee6..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def +++ /dev/null @@ -1,5 +0,0 @@ -help: Script to run on VRRP state-transition to backup -type: txt -syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Backup Script should be an existing executable" -syntax:expression: exec "/opt/vyatta/sbin/check_file_in_config_dir $VAR(@) '/config/scripts'" -val_help: Script in /config/scripts diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def deleted file mode 100644 index f2065249..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def +++ /dev/null @@ -1,5 +0,0 @@ -help: Script to run on VRRP state-transition to fault -type: txt -syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Fault Script should be an existing executable" -syntax:expression: exec "/opt/vyatta/sbin/check_file_in_config_dir $VAR(@) '/config/scripts'" -val_help: Script in /config/scripts diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def deleted file mode 100644 index d87909b7..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def +++ /dev/null @@ -1,5 +0,0 @@ -help: Script to run on VRRP state-transition to master -type: txt -syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Master Script should be an existing executable" -syntax:expression: exec "/opt/vyatta/sbin/check_file_in_config_dir $VAR(@) '/config/scripts'" -val_help: Script in /config/scripts diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def deleted file mode 100644 index 6d195d07..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: scripts to run on VRRP state-transitions - diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def deleted file mode 100644 index a7d2e1fd..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: txt -help: Add this vrrp group to a sync 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 deleted file mode 100644 index 676bf8d3..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def +++ /dev/null @@ -1,9 +0,0 @@ -multi: -type: ipv4,ipv4net -help: Virtual address [REQUIRED] - -syntax:expression: exec " - if [[ '$VAR(@)' == '*/' ]]; then /opt/vyatta/sbin/valid_address $VAR(@); 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) diff --git a/templates/interfaces/ethernet/node.tag/vrrp/node.def b/templates/interfaces/ethernet/node.tag/vrrp/node.def deleted file mode 100644 index 062b2f66..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/node.def +++ /dev/null @@ -1,11 +0,0 @@ -help: Virtual Router Redundancy Protocol (VRRP) -priority: 800 - -# -# Note: there should be NO "commit" checks in the node.def hierarchy for -# vrrp because all the error checking is done on the end nodes. A -# "commit" check that fails in the node.def will prevent the "end" -# node from getting called and the "changes" file will get out of -# sync. -# -end:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action update --intf $VAR(../@) " diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.def deleted file mode 100644 index 00b87c19..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.def +++ /dev/null @@ -1,7 +0,0 @@ -tag: -type: u32 -help: VRRP group number -syntax:expression: $VAR(@) > 0 && $VAR(@) <= 255; "VRRP group must be between 1-255" -val_help: u32:1-255; VRRP group number - -delete:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action delete --intf $VAR(../../@) --group $VAR(@) " diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def deleted file mode 100644 index b9c113cc..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: u32 -default: 1 -help: Advertise interval -syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Advertise interval must be between 1-255" -val_help: u32:1-255; Advertise interval (default 1) diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def deleted file mode 100644 index 180851c4..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Authentication diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def deleted file mode 100644 index 072a2148..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: txt -help: Password -syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,8}$"; - "Password must be 8 characters or less" -val_help: Password (8 characters or less) diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def deleted file mode 100644 index 556c7f35..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def +++ /dev/null @@ -1,7 +0,0 @@ -type: txt -help: Authentication type -syntax:expression: $VAR(@) in "plaintext-password", "ah"; \ - "authentication must be plaintext-password or ah" -allowed: echo plaintext-password ah -val_help: plaintext-password; Plain text password mode -val_help: ah; IP Authentication Header mode diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/description/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/description/node.def deleted file mode 100644 index 849e5273..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/description/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: txt -help: Description diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/disable/node.def deleted file mode 100644 index 93e4cc3e..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/disable/node.def +++ /dev/null @@ -1 +0,0 @@ -help: VRRP group disabled diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def deleted file mode 100644 index d8077a51..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: ipv4 - -help: Hello source address - -val_help: Source address for vrrp hello packets (optional) diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def deleted file mode 100644 index df48a57b..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def +++ /dev/null @@ -1,9 +0,0 @@ -priority: 820 # after vrrp -type: txt - -syntax:expression: pattern $VAR(@) "^.{1,256}$" \ - ; "interface description is too long (limit 256 characters)" - -help: Description for this interface -update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../../../../@)v$VAR(../../@)/ifalias" -delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../../../../@)v$VAR(../../@)/ifalias" diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/interface/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/interface/node.def deleted file mode 100644 index 03f22d28..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/interface/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Configure a virtual MAC interface diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def deleted file mode 100644 index 72f4c33d..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: u32 -syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 1000; \ - "preempt-delay must be between 0-1000" -help: Preempt delay -val_help: u32:0-1000; Preempt Delay in seconds diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def deleted file mode 100644 index baa3aee9..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def +++ /dev/null @@ -1,3 +0,0 @@ -type: bool -help: Preempt mode -default: true diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/priority/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/priority/node.def deleted file mode 100644 index 88684dd8..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/priority/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -syntax:expression: $VAR(@) > 0 &&$VAR(@) <= 255; "priority must be between 1-255" -help: Priority -val_help: u32:1-255; Priority diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def deleted file mode 100644 index 5c319e53..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def +++ /dev/null @@ -1,5 +0,0 @@ -help: Script to run on VRRP state-transition to backup -type: txt -syntax:expression: exec "[ -x $(echo $VAR(@) | awk -F ' ' '{ print $1 }') ] || exit 1"; "Backup script should be an existing executable" -syntax:expression: exec "/opt/vyatta/sbin/check_file_in_config_dir $(echo $VAR(@) | awk -F ' ' '{ print $1 }') '/config/scripts'" -val_help: Script in /config/scripts diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def deleted file mode 100644 index 3d43c2f8..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def +++ /dev/null @@ -1,5 +0,0 @@ -help: Script to run on VRRP state-transition to fault -type: txt -syntax:expression: exec "[ -x $(echo $VAR(@) | awk -F ' ' '{ print $1 }') ] || exit 1"; "Fault script should be an existing executable" -syntax:expression: exec "/opt/vyatta/sbin/check_file_in_config_dir $(echo $VAR(@) | awk -F ' ' '{ print $1 }') '/config/scripts'" -val_help: Script in /config/scripts diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def deleted file mode 100644 index 80b1613c..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def +++ /dev/null @@ -1,5 +0,0 @@ -help: Script to run on VRRP state-transition to master -type: txt -syntax:expression: exec "[ -x $(echo $VAR(@) | awk -F ' ' '{ print $1 }') ] || exit 1"; "Master script should be an existing executable" -syntax:expression: exec "/opt/vyatta/sbin/check_file_in_config_dir $(echo $VAR(@) | awk -F ' ' '{ print $1 }') '/config/scripts'" -val_help: Script in /config/scripts diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def deleted file mode 100644 index 6d3a6c11..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Scripts for VRRP state-transitions - diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def deleted file mode 100644 index a7d2e1fd..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: txt -help: Add this vrrp group to a sync 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 deleted file mode 100644 index 676bf8d3..00000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def +++ /dev/null @@ -1,9 +0,0 @@ -multi: -type: ipv4,ipv4net -help: Virtual address [REQUIRED] - -syntax:expression: exec " - if [[ '$VAR(@)' == '*/' ]]; then /opt/vyatta/sbin/valid_address $VAR(@); 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) -- cgit v1.2.3