Automatic merge from release/2.1.0 -> release/2.2.0

* commit '24e0f1867ff2f1818ac92203b49ed6dc13a96318':
  region: guest min memory size to 8MB
This commit is contained in:
李泽玺
2018-09-20 12:26:32 +08:00
+2 -2
View File
@@ -499,8 +499,8 @@ func validateMemCpuData(data jsonutils.JSONObject) (int, int, error) {
return 0, 0, err
}
maxVmemGb := driver.GetMaxVMemSizeGB()
if vmemSize < 64 || vmemSize > maxVmemGb*1024 {
return 0, 0, httperrors.NewInputParameterError("Memory size must be 64MB ~ %d GB", maxVmemGb)
if vmemSize < 8 || vmemSize > maxVmemGb*1024 {
return 0, 0, httperrors.NewInputParameterError("Memory size must be 8MB ~ %d GB", maxVmemGb)
}
}
vcpuStr, _ := data.GetString("vcpu_count")