opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-31 02:38:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11411 from ioito/automated-cherry-pick-of-#11404-upstream-release-3.7

Browse Source 
Automated cherry pick of #11404: fix(region): ignore qcloud bw pkg error
This commit is contained in:
Zexi Li
2021-06-16 20:09:59 +08:00
committed by GitHub
parent cd76efd19e f36688d4b5
commit c799d89764
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/qcloud/instance.go
+6
View File
@@ -612,6 +612,7 @@ func (self *SRegion) CreateInstance(name string, imageId string, instanceType st
params["InternetAccessible.InternetChargeType"] = internetChargeType
params["InternetAccessible.InternetMaxBandwidthOut"] = fmt.Sprintf("%d", bandwidth)
params["InternetAccessible.PublicIpAssigned"] = "TRUE"
if publicIpBw == 0 {
params["InternetAccessible.PublicIpAssigned"] = "FALSE"
}
@@ -680,6 +681,11 @@ func (self *SRegion) CreateInstance(name string, imageId string, instanceType st
delete(params, "InternetAccessible.InternetMaxBandwidthOut")
return false, nil
}
if strings.Contains(err.Error(), "UnsupportedOperation.BandwidthPackageIdNotSupported") ||
(strings.Contains(err.Error(), "Code=InvalidParameterCombination") && strings.Contains(err.Error(), "InternetAccessible.BandwidthPackageId")) {
delete(params, "InternetAccessible.BandwidthPackageId")
return false, nil
}
return false, errors.Wrapf(err, "RunInstances")
}
return true, nil