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

feat(region): add ProhibitRefreshingCloudImage for options

Browse Source
This commit is contained in:
rainzm
2021-06-23 17:01:28 +08:00
parent 92f81cee39
commit 9f0fdb2913
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cachedimages.go
+4
View File
@@ -300,6 +300,8 @@ func (manager *SCachedimageManager) GetImageById(ctx context.Context, userCred m
oSTypeOk := options.Options.NoCheckOsTypeForCachedImage || len(cachedImage.GetOSType()) > 0
if !refresh && cachedImage.GetStatus() == cloudprovider.IMAGE_STATUS_ACTIVE && oSTypeOk && !cachedImage.isRefreshSessionExpire() {
return cachedImage.GetImage()
} else if options.Options.ProhibitRefreshingCloudImage {
return cachedImage.GetImage()
} else if len(cachedImage.ExternalId) > 0 { // external image, request refresh
return cachedImage.requestRefreshExternalImage(ctx, userCred)
}
@@ -323,6 +325,8 @@ func (manager *SCachedimageManager) getImageByName(ctx context.Context, userCred
cachedImage := imgObj.(*SCachedimage)
if !refresh && cachedImage.GetStatus() == cloudprovider.IMAGE_STATUS_ACTIVE && len(cachedImage.GetOSType()) > 0 && !cachedImage.isRefreshSessionExpire() {
return cachedImage.GetImage()
} else if options.Options.ProhibitRefreshingCloudImage {
return cachedImage.GetImage()
} else if len(cachedImage.ExternalId) > 0 { // external image, request refresh
return cachedImage.requestRefreshExternalImage(ctx, userCred)
}
pkg/compute/options/options.go
+2
View File
@@ -173,6 +173,8 @@ type ComputeOptions struct {
NoCheckOsTypeForCachedImage bool `help:"Don't check os type for cached image"`
ProhibitRefreshingCloudImage bool `help:"Prohibit refreshing cloud image"`
esxi.EsxiOptions
}