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 #11588 from ioito/hotfix/qx-azure-china-redis

Browse Source 
fix(region): avoid sync azure china redis failed
This commit is contained in:
Zexi Li
2021-07-08 11:27:57 +08:00
committed by GitHub
parent d9c5e408b3 247d10f65b
commit 65cf01b029
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/azure/redis.go
+11 -7
View File
@@ -371,13 +371,17 @@ func (self *SRegion) GetIElasticcaches() ([]cloudprovider.ICloudElasticcache, er
redis[i].region = self
ret = append(ret, &redis[i])
}
enterpriseRedis, err := self.GetEnterpriseRedisCaches()
if err != nil {
return nil, errors.Wrapf(err, "GetEnterpriseRedisCaches")
}
for i := range enterpriseRedis {
enterpriseRedis[i].region = self
ret = append(ret, &enterpriseRedis[i])
switch self.client.GetAccessEnv() {
// 国际区才有企业版
case api.CLOUD_ACCESS_ENV_AZURE_GLOBAL:
enterpriseRedis, err := self.GetEnterpriseRedisCaches()
if err != nil {
return nil, errors.Wrapf(err, "GetEnterpriseRedisCaches")
}
for i := range enterpriseRedis {
enterpriseRedis[i].region = self
ret = append(ret, &enterpriseRedis[i])
}
}
return ret, nil
}