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 #5922 from ioito/automated-cherry-pick-of-#5919-upstream-release-3.1

Browse Source 
Automated cherry pick of #5919: fix: 非私有云同步region name
This commit is contained in:
Zexi Li
2020-04-22 23:59:45 +08:00
committed by GitHub
parent 4a3d0bef39 5d2d5f2cb1
commit 8f02b26ae3
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudregions.go
+3
View File
@@ -406,6 +406,9 @@ func (self *SCloudregion) syncWithCloudRegion(ctx context.Context, userCred mccl
}
diff, err := db.UpdateWithLock(ctx, self, func() error {
if !utils.IsInStringArray(self.Provider, api.PRIVATE_CLOUD_PROVIDERS) {
self.Name = cloudRegion.GetName()
}
self.Status = cloudRegion.GetStatus()
self.SGeographicInfo = cloudRegion.GetGeographicInfo()
self.Provider = cloudRegion.GetProvider()