From 826141b6d934a8206dd23db3670bf8c14130dd6c Mon Sep 17 00:00:00 2001 From: John Southworth Date: Tue, 27 Mar 2012 15:12:04 +0000 Subject: Revert "Hide compliant mode vrrp nodes for oxnard since the syntax will change in the future" This reverts commit 82058783f3080948bd5f8289cac225d4d45e7817. --- .../vrrp/vrrp-group/node.tag/.interface/description/node.def | 10 ---------- .../vif/node.tag/vrrp/vrrp-group/node.tag/.interface/node.def | 1 - .../vrrp/vrrp-group/node.tag/interface/description/node.def | 10 ++++++++++ .../vif/node.tag/vrrp/vrrp-group/node.tag/interface/node.def | 1 + .../vrrp/vrrp-group/node.tag/.interface/description/node.def | 9 --------- .../node.tag/vrrp/vrrp-group/node.tag/.interface/node.def | 1 - .../vrrp/vrrp-group/node.tag/interface/description/node.def | 9 +++++++++ .../node.tag/vrrp/vrrp-group/node.tag/interface/node.def | 1 + .../vrrp/vrrp-group/node.tag/.interface/description/node.def | 10 ---------- .../vif/node.tag/vrrp/vrrp-group/node.tag/.interface/node.def | 1 - .../vrrp/vrrp-group/node.tag/interface/description/node.def | 10 ++++++++++ .../vif/node.tag/vrrp/vrrp-group/node.tag/interface/node.def | 1 + .../vrrp/vrrp-group/node.tag/.interface/description/node.def | 9 --------- .../node.tag/vrrp/vrrp-group/node.tag/.interface/node.def | 1 - .../vrrp/vrrp-group/node.tag/interface/description/node.def | 9 +++++++++ .../node.tag/vrrp/vrrp-group/node.tag/interface/node.def | 1 + 16 files changed, 42 insertions(+), 42 deletions(-) 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 create mode 100644 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def create 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/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 create mode 100644 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def create mode 100644 templates/interfaces/bonding/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/.interface/description/node.def delete mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/.interface/node.def create mode 100644 templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def create 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/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 create mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def create mode 100644 templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/interface/node.def 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/interface/description/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def new file mode 100644 index 00000000..a0f78074 --- /dev/null +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def @@ -0,0 +1,10 @@ +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 new file mode 100644 index 00000000..03f22d28 --- /dev/null +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/node.def @@ -0,0 +1 @@ +help: Configure a virtual MAC interface 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/interface/description/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def new file mode 100644 index 00000000..df48a57b --- /dev/null +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def @@ -0,0 +1,9 @@ +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 new file mode 100644 index 00000000..03f22d28 --- /dev/null +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/interface/node.def @@ -0,0 +1 @@ +help: Configure a virtual MAC interface 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/interface/description/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def new file mode 100644 index 00000000..a0f78074 --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def @@ -0,0 +1,10 @@ +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 new file mode 100644 index 00000000..03f22d28 --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/node.def @@ -0,0 +1 @@ +help: Configure a virtual MAC interface 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/interface/description/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def new file mode 100644 index 00000000..df48a57b --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/interface/description/node.def @@ -0,0 +1,9 @@ +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 new file mode 100644 index 00000000..03f22d28 --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/interface/node.def @@ -0,0 +1 @@ +help: Configure a virtual MAC interface -- cgit v1.2.3