opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10825 from ioito/hotfix/qx-pre-allocate-ip

Browse Source 
fix(region): avoid assign vm ip addr not effect
This commit is contained in:
Zexi Li
2021-04-20 17:15:39 +08:00
committed by GitHub
parent 3d58162d97 44a48fef6e
commit 9411cfebd0
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/guestdrivers/virtualization.go
+7 -1
View File
@@ -23,11 +23,13 @@ import (
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/util/netutils"
"yunion.io/x/pkg/utils"
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/cloudcommon/db/quotas"
"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
"yunion.io/x/onecloud/pkg/compute/models"
"yunion.io/x/onecloud/pkg/compute/options"
"yunion.io/x/onecloud/pkg/httperrors"
"yunion.io/x/onecloud/pkg/mcclient"
)
@@ -69,7 +71,11 @@ func (self *SVirtualizedGuestDriver) GetNamedNetworkConfiguration(guest *models.
Ifname: "",
})
}
return net, nicConfs, api.IPAllocationStepdown, false
reUse := false
if len(netConfig.Address) > 0 && !options.Options.EnablePreAllocateIpAddr && !utils.IsInStringArray(host.GetProviderName(), []string{api.CLOUD_PROVIDER_ONECLOUD, api.CLOUD_PROVIDER_VMWARE}) {
reUse = true
}
return net, nicConfs, api.IPAllocationStepdown, reUse
}
func (self *SVirtualizedGuestDriver) GetRandomNetworkTypes() []string {