diff options
| author | John Southworth <john.southworth@vyatta.com> | 2012-05-15 18:56:28 -0700 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2012-05-15 20:45:07 -0700 |
| commit | 318324c9e9509484a647909f1431550bfc143cc9 (patch) | |
| tree | 6821177e1d0d71c026cf6a990ce63cff14f5b5e8 | |
| parent | d7582e120e2bea3eeb109b2609edad3963fe109e (diff) | |
| download | vyatta-cfg-qos-318324c9e9509484a647909f1431550bfc143cc9.tar.gz vyatta-cfg-qos-318324c9e9509484a647909f1431550bfc143cc9.zip | |
No need to genererate vrrp interface templates anymore
| -rwxr-xr-x | gen-interface-templates.pl | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/gen-interface-templates.pl b/gen-interface-templates.pl index 1824fae..06fe254 100755 --- a/gen-interface-templates.pl +++ b/gen-interface-templates.pl @@ -31,17 +31,11 @@ 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/vrrp/vrrp-group/node.tag/interface' => '$VAR(../../../@)v$VAR(../@)', 'bonding/node.tag/vif/node.tag' => '$VAR(../@).$VAR(@)', - 'bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/interface' => - '$VAR(../../../../@).$VAR(../../../@)v$VAR(../@)', 'pseudo-ethernet/node.tag' => '$VAR(@)', # 'pseudo-ethernet/node.tag/vif/node.tag' => '$VAR(../@).$VAR(@)', @@ -94,9 +88,6 @@ sub gen_template { open my $inf, '<', $in or die "Can't open $in: $!"; open my $outf, '>', $out or die "Can't open $out: $!"; - print $outf "priority: 820 \# after vrrp\n" - if ($iftree =~ /vrrp/ && ($in =~ /\/in\// || $in =~ /\/out\//)); - while ( my $line = <$inf> ) { $line =~ s#\$IFNAME#$ifname#; next if (($line =~ /^update:/ || $line =~ /^delete:/) && $iftree =~ /openvpn/); |