From 0fe34202b701df80ceadf93823b5840f47e75a01 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Tue, 31 May 2022 20:55:53 +0800 Subject: [PATCH] add options to set disk driver and cachemode --- pkg/compute/models/guestdisks.go | 5 +++-- pkg/compute/options/options.go | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/compute/models/guestdisks.go b/pkg/compute/models/guestdisks.go index 83f4881b25..ddf126184f 100644 --- a/pkg/compute/models/guestdisks.go +++ b/pkg/compute/models/guestdisks.go @@ -24,6 +24,7 @@ import ( api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/compute/options" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/util/stringutils2" @@ -144,10 +145,10 @@ func (manager *SGuestdiskManager) FetchCustomizeColumns( func (self *SGuestdisk) DoSave(ctx context.Context, driver string, cache string, mountpoint string) error { self.ImagePath = "" if len(driver) == 0 { - driver = "scsi" + driver = options.Options.DefaultDiskDriver } if len(cache) == 0 { - cache = "writeback" + cache = options.Options.DefaultDiskCacheMode } if len(mountpoint) > 0 { self.Mountpoint = mountpoint diff --git a/pkg/compute/options/options.go b/pkg/compute/options/options.go index 0f8106a720..a51209e452 100644 --- a/pkg/compute/options/options.go +++ b/pkg/compute/options/options.go @@ -87,6 +87,9 @@ type ComputeOptions struct { DefaultHostQuota int `default:"500" help:"Common host quota per domain, default 500"` DefaultVpcQuota int `default:"500" help:"Common vpc quota per domain, default 500"` + DefaultDiskDriver string `help:"default disk driver" choices:"scsi|virtio|ide" default:"scsi"` + DefaultDiskCacheMode string `help:"default kvm disk cache mode" choices:"writeback|none|writethrough" default:"writeback"` + SystemAdminQuotaCheck bool `help:"Enable quota check for system admin, default False" default:"false"` CloudaccountHealthStatusCheck bool `help:"Enable cloudaccount health status check, default True" default:"true"`