Merge pull request #12171 from ioito/hotfix/qx-scheduler-option

fix(scheduler): options for openstack scheduler
This commit is contained in:
Zexi Li
2021-09-10 11:53:56 +08:00
committed by GitHub
2 changed files with 21 additions and 4 deletions
+12 -4
View File
@@ -48,13 +48,21 @@ func init() {
models.RegisterGuestDriver(&driver)
}
func (self *SOpenStackGuestDriver) DoScheduleCPUFilter() bool { return true }
func (self *SOpenStackGuestDriver) DoScheduleCPUFilter() bool {
return options.Options.SchedulerOptions.OpenStackSchedulerCPUFilter
}
func (self *SOpenStackGuestDriver) DoScheduleMemoryFilter() bool { return true }
func (self *SOpenStackGuestDriver) DoScheduleMemoryFilter() bool {
return options.Options.SchedulerOptions.OpenStackSchedulerMemoryFilter
}
func (self *SOpenStackGuestDriver) DoScheduleSKUFilter() bool { return false }
func (self *SOpenStackGuestDriver) DoScheduleSKUFilter() bool {
return options.Options.SchedulerOptions.OpenStackSchedulerSKUFilter
}
func (self *SOpenStackGuestDriver) DoScheduleStorageFilter() bool { return true }
func (self *SOpenStackGuestDriver) DoScheduleStorageFilter() bool {
return options.Options.SchedulerOptions.OpenStackSchedulerStorageFilter
}
func (self *SOpenStackGuestDriver) GetHypervisor() string {
return api.HYPERVISOR_OPENSTACK
+9
View File
@@ -176,6 +176,15 @@ type ComputeOptions struct {
ProhibitRefreshingCloudImage bool `help:"Prohibit refreshing cloud image"`
esxi.EsxiOptions
SchedulerOptions
}
type SchedulerOptions struct {
OpenStackSchedulerCPUFilter bool `help:"Scheduler OpenStack usable host by cpu" default:"true"`
OpenStackSchedulerMemoryFilter bool `help:"Scheduler OpenStack usable host by memory" default:"true"`
OpenStackSchedulerStorageFilter bool `help:"Scheduler OpenStack usable host by storage" default:"true"`
OpenStackSchedulerSKUFilter bool `help:"Scheduler OpenStack usable host by sku" default:"false"`
}
type SCapabilityOptions struct {