From 46d412d998ee3331633242e2d2271995527a75a3 Mon Sep 17 00:00:00 2001 From: nvazquez Date: Wed, 30 Sep 2020 11:33:27 -0300 Subject: [PATCH] Fix for system VMs --- .../cloudstack/engine/orchestration/VolumeOrchestrator.java | 2 +- .../java/com/cloud/hypervisor/guru/VmwareVmImplementer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java index aedaf4018f3..de5e260a6e8 100644 --- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java @@ -759,7 +759,7 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati Long size = _tmpltMgr.getTemplateSize(template.getId(), vm.getDataCenterId()); if (rootDisksize != null) { - if (vm.getHypervisorType() == HypervisorType.VMware && vm.getType() == VirtualMachine.Type.User) { + if (vm.getHypervisorType() == HypervisorType.VMware) { // Volume size specified from template deploy-as-is size = rootDisksize; } else { diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VmwareVmImplementer.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VmwareVmImplementer.java index 6638d769df8..0e0dd8c56b1 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VmwareVmImplementer.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VmwareVmImplementer.java @@ -105,7 +105,7 @@ class VmwareVmImplementer { VirtualMachineTO implement(VirtualMachineProfile vm, VirtualMachineTO to, long clusterId) { to.setBootloader(VirtualMachineTemplate.BootloaderType.HVM); - boolean deployAsIs = vm.getType() == VirtualMachine.Type.User; + boolean deployAsIs = true; HostVO host = hostDao.findById(vm.getVirtualMachine().getHostId()); Map details = to.getDetails(); if (details == null)