diff options
13 files changed, 5 insertions, 43 deletions
diff --git a/scripts/keepalived/vyatta-keepalived.pl b/scripts/keepalived/vyatta-keepalived.pl index 60b02608..3674b8b5 100755 --- a/scripts/keepalived/vyatta-keepalived.pl +++ b/scripts/keepalived/vyatta-keepalived.pl @@ -147,7 +147,7 @@ sub keepalived_get_values { my $use_vmac = 0; my $transition_intf = $intf; - if ( $config->exists("interface") ) { + if ( $config->exists("rfc3768-compatibility") ) { $use_vmac = 1; $transition_intf = "$intf"."v"."$group"; } 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/rfc3768-compatibility/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/rfc3768-compatibility/node.def new file mode 100644 index 00000000..6ff66691 --- /dev/null +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/rfc3768-compatibility/node.def @@ -0,0 +1 @@ +help: Enable RFC 3768 compatibility 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/rfc3768-compatibility/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/rfc3768-compatibility/node.def new file mode 100644 index 00000000..6ff66691 --- /dev/null +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/rfc3768-compatibility/node.def @@ -0,0 +1 @@ +help: Enable RFC 3768 compatibility 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/rfc3768-compatibility/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/rfc3768-compatibility/node.def new file mode 100644 index 00000000..6ff66691 --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/rfc3768-compatibility/node.def @@ -0,0 +1 @@ +help: Enable RFC 3768 compatibility 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/rfc3768-compatibility/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/rfc3768-compatibility/node.def new file mode 100644 index 00000000..6ff66691 --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/rfc3768-compatibility/node.def @@ -0,0 +1 @@ +help: Enable RFC 3768 compatibility |