fanhuadesenlinnn/cloudpods
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/yunionio/cloudpods.git synced 2026-09-20 08:03:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(host-deployer): bond netplan add vlan subinterface config (#25178)

Browse Source
This commit is contained in:
wanyaoqi
2026-07-20 12:16:20 +08:00
committed by GitHub
parent 142b0dabf5
commit 1d2c8733ad
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/hostman/guestfs/fsdriver/netplan.go
View File

@@ -86,17 +86,32 @@ func newNetplanNetwork(allNics []*types.SServerNic, bondNics []*types.SServerNic
network.AddEthernet(sn.Name, nicConf)
}
netConf := getNetplanEthernetConfig(bondNic, true, mainIp, mainIp6, nicCnt)
if netConf.Mtu == 0 {
netConf.Mtu = defaultMtu
}
if bondNic.VlanInterface {
ifname := fmt.Sprintf("%s.%d", bondNic.Name, bondNic.Vlan)
vlanConfig := &netplan.VlanConfig{
EthernetConfig: *netConf,
Link: bondNic.Name,
Id: bondNic.Vlan,
}
network.AddVlan(ifname, vlanConfig)
// TODO: implement kinds of bond mode config
bondConf := netplan.NewBondMode4(netConf, interfaces)
network.AddBond(bondNic.Name, bondConf)
bondNicConf := &netplan.EthernetConfig{
DHCP4: false,
DHCP6: false,
MacAddress: bondNic.Mac,
Match: netplan.NewEthernetConfigMatchMac(bondNic.Mac),
}
bondConf := netplan.NewBondMode4(bondNicConf, interfaces)
network.AddBond(bondNic.Name, bondConf)
} else {
// TODO: implement kinds of bond mode config
bondConf := netplan.NewBondMode4(netConf, interfaces)
network.AddBond(bondNic.Name, bondConf)
}
}
return network