Merge branch '4.16'

This commit is contained in:
nvazquez 2022-03-18 07:56:27 -03:00
commit 6e061d90fe
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84

View File

@ -2638,7 +2638,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
Map<String, String> customParameters = new HashMap<>();
customParameters.put(VmDetailConstants.CPU_NUMBER, String.valueOf(newCpu));
customParameters.put(VmDetailConstants.MEMORY, String.valueOf(newMemory));
customParameters.put(VmDetailConstants.CPU_SPEED, details.get(VmDetailConstants.CPU_SPEED));
if (svcOffering.isCustomCpuSpeedSupported()) {
customParameters.put(VmDetailConstants.CPU_SPEED, details.get(VmDetailConstants.CPU_SPEED));
}
validateCustomParameters(svcOffering, customParameters);
}
if (VirtualMachineManager.ResourceCountRunningVMsonly.value()) {