From d5700952eece79ecae7532ee1fbcf475a0bc63a0 Mon Sep 17 00:00:00 2001 From: Bob Gilligan Date: Mon, 28 Nov 2011 15:12:51 -0800 Subject: Use new naming convention for VRRP virtual mac interfaces. The new naming convention is: v where is the name of the underlying physical interface or VLAN and is the virtual router ID. For example: eth0v235, eth7.4000v199. --- scripts/keepalived/vyatta-keepalived.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/keepalived/vyatta-keepalived.pl b/scripts/keepalived/vyatta-keepalived.pl index e834745b..f419ac41 100755 --- a/scripts/keepalived/vyatta-keepalived.pl +++ b/scripts/keepalived/vyatta-keepalived.pl @@ -247,7 +247,9 @@ sub keepalived_get_values { $output .= "\tinterface $intf\n"; $output .= "\tvirtual_router_id $group\n"; if ($use_vmac) { - $output .= "\tuse_vmac\n"; + $output .= "\tuse_vmac $intf"; + $output .= "v"; + $output .= "$group\n"; } $output .= "\tpriority $priority\n"; if ( $preempt eq "false" ) { -- cgit v1.2.3 From 2f27de622dc731b7f64a385b2653d14410081c7f Mon Sep 17 00:00:00 2001 From: Bob Gilligan Date: Mon, 28 Nov 2011 15:15:13 -0800 Subject: 0.19.129 --- debian/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 40916f0b..03297041 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +vyatta-cfg-system (0.19.129) unstable; urgency=low + + [ Stephen Hemminger ] + * Remove unnecessary sudo on ethtool + * Fix perl deprecated warning with 5.14 + + [ Bob Gilligan ] + * Use new naming convention for VRRP virtual mac interfaces. + + -- Bob Gilligan Mon, 28 Nov 2011 15:15:13 -0800 + vyatta-cfg-system (0.19.128) unstable; urgency=low * Fix dyndns failure caused by commit: -- cgit v1.2.3 From b3f1b28ee4899358f78ff3b182bedb3293a446b6 Mon Sep 17 00:00:00 2001 From: Bob Gilligan Date: Mon, 28 Nov 2011 15:39:26 -0800 Subject: Support VRRP virtual MAC interfaces above bond and bond vif interfaces This provides the same configuration parameters as are used to configure VRRP virtual MAC interfaces above ethernet and ethernet vif interfaces. --- .../node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface/node.def | 1 + .../bonding/node.tag/vrrp/vrrp-group/node.tag/interface/node.def | 1 + 2 files changed, 2 insertions(+) create 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/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/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/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 -- cgit v1.2.3 From 7101027a6a9a10ef26383bb39a452aeaa3526629 Mon Sep 17 00:00:00 2001 From: Bob Gilligan Date: Mon, 28 Nov 2011 15:41:39 -0800 Subject: 0.19.130 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 03297041..0ad2c1b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vyatta-cfg-system (0.19.130) unstable; urgency=low + + * Support VRRP virtual MAC interfaces above bond and bond vif + interfaces + + -- Bob Gilligan Mon, 28 Nov 2011 15:41:39 -0800 + vyatta-cfg-system (0.19.129) unstable; urgency=low [ Stephen Hemminger ] -- cgit v1.2.3