proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-08-09 05:15:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

INotify: add bond-primary option

Browse Source 
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2020-01-09 14:11:02 +01:00 committed by Thomas Lamprecht
parent c8ff0bdf3d
commit b94d05ecc6
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/PVE/INotify.pm
View File

@ -956,6 +956,7 @@ sub __read_etc_network_interfaces {
'bridge-multicast-flood' => 1, 'bridge-multicast-flood' => 1,
'bond_miimon' => 1, 'bond_miimon' => 1,
'bond_xmit_hash_policy' => 1, 'bond_xmit_hash_policy' => 1,
'bond-primary' => 1,
'uplink-id' => 1, 'uplink-id' => 1,
'vlan-protocol' => 1, 'vlan-protocol' => 1,
'vxlan-id' => 1, 'vxlan-id' => 1,
@ -1234,6 +1235,12 @@ sub __interface_to_string {
$raw .= "\tbond-xmit-hash-policy $d->{'bond_xmit_hash_policy'}\n"; $raw .= "\tbond-xmit-hash-policy $d->{'bond_xmit_hash_policy'}\n";
} }
$done->{'bond_xmit_hash_policy'} = 1; $done->{'bond_xmit_hash_policy'} = 1;
if ($d->{'bond_mode'} && $d->{'bond_mode'} eq 'active-backup' && $d->{'bond-primary'}) {
$raw .= "\tbond-primary $d->{'bond-primary'}\n";
}
$done->{'bond-primary'} = 1;
} elsif ($d->{type} eq 'vlan') { } elsif ($d->{type} eq 'vlan') {
die "$iface: wrong vlan-protocol $d->{'vlan-protocol'}\n" die "$iface: wrong vlan-protocol $d->{'vlan-protocol'}\n"
if $d->{'vlan-protocol'} && $d->{'vlan-protocol'} ne '802.1ad' && $d->{'vlan-protocol'} ne '802.1q'; if $d->{'vlan-protocol'} && $d->{'vlan-protocol'} ne '802.1ad' && $d->{'vlan-protocol'} ne '802.1q';
@ -1427,6 +1434,7 @@ sub __write_etc_network_interfaces {
foreach my $iface (keys %$ifaces) { foreach my $iface (keys %$ifaces) {
my $d = $ifaces->{$iface}; my $d = $ifaces->{$iface};
if ($d->{type} eq 'bond' && $d->{slaves}) { if ($d->{type} eq 'bond' && $d->{slaves}) {
my $bond_primary_is_slave = undef;
foreach my $p (split (/\s+/, $d->{slaves})) { foreach my $p (split (/\s+/, $d->{slaves})) {
my $n = $ifaces->{$p}; my $n = $ifaces->{$p};
@ -1435,7 +1443,9 @@ sub __write_etc_network_interfaces {
die "bond '$iface' - wrong interface type on slave '$p' " . die "bond '$iface' - wrong interface type on slave '$p' " .
"('$n->{type}' != 'eth')\n" if $n->{type} ne 'eth'; "('$n->{type}' != 'eth')\n" if $n->{type} ne 'eth';
&$check_mtu($ifaces, $iface, $p); &$check_mtu($ifaces, $iface, $p);
$bond_primary_is_slave = 1 if $d->{'bond-primary'} && $d->{'bond-primary'} eq $p;
} }
die "bond '$iface' - bond-primary interface is not a slave" if $d->{'bond-primary'} && !$bond_primary_is_slave;
} }
} }