mirror of
https://github.com/yunionio/cloudpods.git
synced 2026-09-19 02:37:24 +08:00
fix: s3 common options (#23445)
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
This commit is contained in:
@@ -163,7 +163,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"`
|
||||
@@ -177,7 +177,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"`
|
||||
|
||||
@@ -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"`
|
||||
S3SignVersion string `help:"signing version"`
|
||||
|
||||
Reference in New Issue
Block a user