From 3dd3a3d6e53497be297f0e63ee30872d9ce4ed9a Mon Sep 17 00:00:00 2001 From: John Southworth Date: Thu, 1 Dec 2011 16:25:42 -0800 Subject: Generate traffic-policy nodes for vrrp interfaces --- gen-interface-templates.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gen-interface-templates.pl b/gen-interface-templates.pl index 8fb221c..a09a45f 100755 --- a/gen-interface-templates.pl +++ b/gen-interface-templates.pl @@ -31,11 +31,15 @@ my %interface_hash = ( 'loopback/node.tag' => '$VAR(@)', 'ethernet/node.tag' => '$VAR(@)', 'ethernet/node.tag/pppoe/node.tag' => 'pppoe$VAR(@)', + 'ethernet/node.tag/vrrp/vrrp-group/node.tag/interface' => '$VAR(../../../@)v$VAR(../@)', 'ethernet/node.tag/vif/node.tag' => '$VAR(../@).$VAR(@)', 'ethernet/node.tag/vif/node.tag/pppoe/node.tag' => 'pppoe$VAR(@)', + 'ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface' => + '$VAR(../../../../@).$VAR(../../../@)v$VAR(../@)', 'wireless/node.tag' => '$VAR(@)', 'bonding/node.tag' => '$VAR(@)', 'bonding/node.tag/vif/node.tag' => '$VAR(../@).$VAR(@)', + 'bonding/node.tag/vrrp/vrrp-group/node.tag/interface' => '$VAR(../../../@)v$VAR(../@)', 'pseudo-ethernet/node.tag' => '$VAR(@)', # 'pseudo-ethernet/node.tag/vif/node.tag' => '$VAR(../@).$VAR(@)', -- cgit v1.2.3 From 1a46f4ce3a6dfde78641c4e8197c42dc27cab494 Mon Sep 17 00:00:00 2001 From: John Southworth Date: Thu, 1 Dec 2011 16:55:38 -0800 Subject: 0.15.25 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index f8ec12b..19fbe87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg-qos (0.15.25) unstable; urgency=low + + * Generate traffic-policy nodes for vrrp interfaces + + -- John Southworth Thu, 01 Dec 2011 16:55:38 -0800 + vyatta-cfg-qos (0.15.24) unstable; urgency=low * Fix non-numeric comparison -- cgit v1.2.3