diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-11-09 13:34:27 -0800 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-11-09 13:34:27 -0800 |
| commit | 908efc309948d75ef04c91048141d663ca1b5575 (patch) | |
| tree | 9d96ea9a64691c1cab5221dcd0800dc6be671419 | |
| parent | 833850f2686e1ef6d6ff971ffeafa42558467ef0 (diff) | |
| parent | f993ea0c32500b4754d4e0f76ecac67eec744796 (diff) | |
| download | vyatta-cfg-system-908efc309948d75ef04c91048141d663ca1b5575.tar.gz vyatta-cfg-system-908efc309948d75ef04c91048141d663ca1b5575.zip | |
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg-system into changes-john-southworth
4 files changed, 21 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 3792bd88..12f5121e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +vyatta-cfg-system (0.19.126) unstable; urgency=low + + [ Stephen Hemminger ] + * Cleanup dynamic DNS script + + [ Bob Gilligan ] + * First pass implementation of support for virtual MAC address + + -- Bob Gilligan <gilligan@vyatta.com> Tue, 08 Nov 2011 16:04:53 -0800 + vyatta-cfg-system (0.19.125) unstable; urgency=low * pseudo-ethernet remove incorrect template diff --git a/scripts/keepalived/vyatta-keepalived.pl b/scripts/keepalived/vyatta-keepalived.pl index 7a113469..e834745b 100755 --- a/scripts/keepalived/vyatta-keepalived.pl +++ b/scripts/keepalived/vyatta-keepalived.pl @@ -144,6 +144,12 @@ sub keepalived_get_values { push @errs, $err; next; } + + my $use_vmac = 0; + if ( $config->exists("interface") ) { + $use_vmac = 1; + } + my $priority = $config->returnValue("priority"); if ( !defined $priority ) { $priority = 1; @@ -240,6 +246,9 @@ sub keepalived_get_values { $output .= "\tstate $init_state\n"; $output .= "\tinterface $intf\n"; $output .= "\tvirtual_router_id $group\n"; + if ($use_vmac) { + $output .= "\tuse_vmac\n"; + } $output .= "\tpriority $priority\n"; if ( $preempt eq "false" ) { $output .= "\tnopreempt\n"; 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/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 |