mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-02 20:02:29 +01:00
Merge branch '4.16'
This commit is contained in:
commit
6e061d90fe
@ -2638,7 +2638,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
|
|||||||
Map<String, String> customParameters = new HashMap<>();
|
Map<String, String> customParameters = new HashMap<>();
|
||||||
customParameters.put(VmDetailConstants.CPU_NUMBER, String.valueOf(newCpu));
|
customParameters.put(VmDetailConstants.CPU_NUMBER, String.valueOf(newCpu));
|
||||||
customParameters.put(VmDetailConstants.MEMORY, String.valueOf(newMemory));
|
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);
|
validateCustomParameters(svcOffering, customParameters);
|
||||||
}
|
}
|
||||||
if (VirtualMachineManager.ResourceCountRunningVMsonly.value()) {
|
if (VirtualMachineManager.ResourceCountRunningVMsonly.value()) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user