fix: s3 common options (#23443)

Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
This commit is contained in:
Jian Qiu
2025-09-29 19:22:14 +08:00
committed by GitHub
co-authored by Qiu Jian
parent 7947bd6686
commit ab6f22c5db
2 changed files with 2 additions and 7 deletions
+2 -2
View File
@@ -150,7 +150,7 @@ type CommonOptions struct {
type HostCommonOptions struct {
CommonOptions
S3ScreenDumpOptions
S3CommonOptions
ExecutorSocketPath string `help:"Executor socket path" default:"/var/run/onecloud/exec.sock"`
DeployServerSocketPath string `help:"Deploy server listen socket path" default:"/var/run/onecloud/deploy.sock"`
@@ -164,7 +164,7 @@ type HostCommonOptions struct {
Qcow2Preallocation string `help:"Qcow2 image create preallocation" default:"metadata" choices:"disable|metadata|falloc|full"`
}
type S3ScreenDumpOptions struct {
type S3CommonOptions struct {
S3AccessKey string `help:"s3 access key"`
S3SecretKey string `help:"s3 secret key"`
S3Endpoint string `help:"s3 endpoint"`
-5
View File
@@ -46,11 +46,6 @@ type SImageOptions struct {
StorageDriver string `help:"image backend storage" default:"local" choices:"s3|local"`
S3AccessKey string `help:"s3 access key"`
S3SecretKey string `help:"s3 secret key"`
S3Endpoint string `help:"s3 endpoint"`
S3UseSSL bool `help:"s3 access use ssl"`
S3BucketName string `help:"s3 bucket name" default:"onecloud-images"`
S3MountPoint string `help:"s3fs mount point" default:"/opt/cloud/workspace/data/glance/s3images"`
S3CheckImageStatus bool `help:"Enable s3 check image status"`