From 0f13c2ec3275569e6ac06b738bd3e8c8aaf62d4d Mon Sep 17 00:00:00 2001 From: nvazquez Date: Thu, 5 Mar 2020 11:11:41 -0300 Subject: [PATCH] Fix VM with ISO attached migration issue --- .../cloudstack/storage/image/TemplateDataFactoryImpl.java | 2 +- .../src/main/java/com/cloud/template/TemplateManagerImpl.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java index afce5d2d27dd..8343a74d60b7 100644 --- a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java +++ b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java @@ -68,7 +68,7 @@ public class TemplateDataFactoryImpl implements TemplateDataFactory { @Override public TemplateInfo getTemplate(long templateId, DataStore store) { VMTemplateVO templ = imageDataDao.findById(templateId); - if (store == null) { + if (store == null && !templ.isDirectDownload()) { TemplateObject tmpl = TemplateObject.getTemplate(templ, null); return tmpl; } diff --git a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java index 93905fc0f3fb..749f272bf361 100755 --- a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java @@ -584,10 +584,8 @@ public void prepareIsoForVmProfile(VirtualMachineProfile profile, DeployDestinat } poolId = storagePool.getId(); } - template = prepareIso(vm.getIsoId(), vm.getDataCenterId(), dest.getHost().getId(), poolId); - } else { - template = _tmplFactory.getTemplate(vm.getIsoId(), DataStoreRole.Primary, dest.getDataCenter().getId()); } + template = prepareIso(vm.getIsoId(), vm.getDataCenterId(), dest.getHost().getId(), poolId); if (template == null){ s_logger.error("Failed to prepare ISO on secondary or cache storage");