fanhuadesenlinnn/cloudpods
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/yunionio/cloudpods.git synced 2026-09-20 08:03:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(glance): set s3 bucket name before s3 init check (#24239)

Browse Source
This commit is contained in:
wanyaoqi
2026-02-04 23:08:05 +08:00
committed by GitHub
parent 6c60c9bc43
commit 8ccf60e359
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/image/service/service.go
View File

@@ -164,6 +164,11 @@ func startMasterTasks(app *appsrv.Application, opts *options.SImageOptions) {
}
go func() {
if options.Options.S3BucketName == "" {
options.Options.S3BucketName = DEFAULT_IMAGE_S3_BUCKET
log.Infof("Set s3 bucket name to %s", options.Options.S3BucketName)
}
if options.Options.HasValidS3Options() {
initS3()
}
@@ -207,10 +212,6 @@ func hasVmwareAccount() (bool, error) {
const DEFAULT_IMAGE_S3_BUCKET = "onecloud-images"
func initS3() {
if options.Options.S3BucketName == "" {
options.Options.S3BucketName = DEFAULT_IMAGE_S3_BUCKET
}
err := s3.Init(
options.Options.S3Endpoint,
options.Options.S3AccessKey,