opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #902 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-host-enable-netif-use-guest-network to release/2.4.0

Browse Source 
* commit '14b9b2314c88ad743c02cc67b2d26f255bf44eb4':
  修正：host启用netif时应该优先使用server_type为baremetal的network
This commit is contained in:
邱剑
2019-01-07 16:27:30 +08:00
parent 598b6c83f7 14b9b2314c
commit 7f5fd08aae
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/hosts.go
+1 -1
View File
@@ -2984,7 +2984,7 @@ func (self *SHost) EnableNetif(ctx context.Context, userCred mcclient.TokenCrede
return fmt.Errorf("Network %s not reacheable on mac %s", network, netif.Mac)
}
} else {
net, err = wire.GetCandidatePrivateNetwork(userCred, false, SERVER_TYPE_GUEST)
net, err = wire.GetCandidatePrivateNetwork(userCred, false, SERVER_TYPE_BAREMETAL)
if err != nil || net == nil {
return fmt.Errorf("No network found")
}