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 #9995 from ioito/hotfix/qx-aws-public-ip

Browse Source 
fix(region): aws not support create server with public ip
This commit is contained in:
yunion-ci-robot
2021-01-23 22:43:34 +08:00
committed by GitHub
parent d650ba2d77 1e3d38acc1
commit 47ba4f6915
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+9 -4
View File
@@ -5247,8 +5247,11 @@ func (self *SGuest) ToCreateInput(userCred mcclient.TokenCredential) *api.Server
userInput.KeypairId = genInput.KeypairId
userInput.EipBw = genInput.EipBw
userInput.EipChargeType = genInput.EipChargeType
userInput.PublicIpBw = genInput.PublicIpBw
userInput.PublicIpChargeType = genInput.PublicIpChargeType
provider := self.GetDriver()
if provider.IsSupportPublicIp() {
userInput.PublicIpBw = genInput.PublicIpBw
userInput.PublicIpChargeType = genInput.PublicIpChargeType
}
userInput.AutoRenew = genInput.AutoRenew
// cloned server should belongs to the project creating it
userInput.ProjectId = userCred.GetProjectId()
@@ -5318,8 +5321,10 @@ func (self *SGuest) toCreateInput() *api.ServerCreateInput {
r.EipBw = eip.Bandwidth
r.EipChargeType = eip.ChargeType
case api.EIP_MODE_INSTANCE_PUBLICIP:
r.PublicIpBw = eip.Bandwidth
r.PublicIpChargeType = eip.ChargeType
if driver := self.GetDriver(); driver.IsSupportPublicIp() {
r.PublicIpBw = eip.Bandwidth
r.PublicIpChargeType = eip.ChargeType
}
}
}
if zone := self.getZone(); zone != nil {