Merge pull request #1832 from ioito/hotfix/qx-cloud-account-sync

避免因cloudprovider disable导致账号同步失效
This commit is contained in:
yunion-ci-robot
2019-07-23 12:02:04 +08:00
committed by GitHub
+6 -4
View File
@@ -1322,10 +1322,12 @@ func (account *SCloudaccount) syncAccountStatus(ctx context.Context, userCred mc
account.markAccountConnected(ctx, userCred)
providers := account.importAllSubaccounts(ctx, userCred, subaccounts)
for i := range providers {
_, err := providers[i].prepareCloudproviderRegions(ctx, userCred)
if err != nil {
log.Errorf("syncCloudproviderRegion fail %s", err)
return err
if providers[i].Enabled {
_, err := providers[i].prepareCloudproviderRegions(ctx, userCred)
if err != nil {
log.Errorf("syncCloudproviderRegion fail %s", err)
return err
}
}
}
return nil