Pick VID in configureInstallModeDHCP

Signed-off-by: Jian Wang <[email protected]> Co-authored-by: Kiefer Chang <[email protected]> (cherry picked from commit 9e1027f)
harvester · Nov 7, 2024 · 964cad8 · 964cad8
1 parent 9098efa
commit 964cad8
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/pkg/console/install_panels.go b/pkg/console/install_panels.go
@@ -2095,8 +2095,7 @@ func addInstallPanel(c *Console) error {
 			}
 
 			if needToGetVIPFromDHCP(c.config.VipMode, c.config.Vip, c.config.VipHwAddr) {
-				mgmtName := getManagementInterfaceName(c.config.ManagementInterface)
-				vip, err := getVipThroughDHCP(mgmtName)
+				vip, err := getVipThroughDHCP(getManagementInterfaceName(c.config.ManagementInterface))
 				if err != nil {
 					printToPanel(c.Gui, fmt.Sprintf("fail to get vip: %s", err), installPanel)
 					return
@@ -2265,8 +2264,7 @@ func addVIPPanel(c *Console) error {
 			spinner := NewSpinner(c.Gui, vipTextPanel, "Requesting IP through DHCP...")
 			spinner.Start()
 			go func(g *gocui.Gui) {
-				mgmtName := getManagementInterfaceName(c.config.ManagementInterface)
-				vip, err := getVipThroughDHCP(mgmtName)
+				vip, err := getVipThroughDHCP(getManagementInterfaceName(c.config.ManagementInterface))
 				if err != nil {
 					spinner.Stop(true, err.Error())
 					g.Update(func(_ *gocui.Gui) error {
@@ -2592,6 +2590,7 @@ func configureInstallModeDHCP(c *Console) {
 		mgmtNetwork.BondOptions = netDef.BondOptions
 	}
 	mgmtNetwork.Method = netDef.Method
+	mgmtNetwork.VlanID = netDef.VlanID
 
 	_, err := applyNetworks(
 		mgmtNetwork,