diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java index 5336d30fe07..25c66343e97 100644 --- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java +++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java @@ -462,24 +462,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy if (!isExplicit && vm.getType() == VirtualMachine.Type.User) { //add explicitly dedicated resources in avoidList DedicatedResourceVO dedicatedZone = _dedicatedDao.findByZoneId(dc.getId()); - if (dedicatedZone != null) { - long accountDomainId = vmProfile.getOwner().getDomainId(); - long accountId = vmProfile.getOwner().getAccountId(); - if (dedicatedZone.getDomainId() != null && !dedicatedZone.getDomainId().equals(accountDomainId)) { - throw new CloudRuntimeException("Failed to deploy VM. Zone " + dc.getName() + " is dedicated."); - } - - // If a zone is dedicated to an account then all hosts in this zone will be explicitly dedicated to - // that account. So there won't be any shared hosts in the zone, the only way to deploy vms from that - // account will be to use explicit dedication affinity group. - if (dedicatedZone.getAccountId() != null) { - if (dedicatedZone.getAccountId().equals(accountId)) { - throw new CloudRuntimeException("Failed to deploy VM. There are no shared hosts available in" + - " this dedicated zone."); - } else { - throw new CloudRuntimeException("Failed to deploy VM. Zone " + dc.getName() + " is dedicated."); - } - } + if (dedicatedZone != null && dedicatedZone.getDomainId() != null) { + throw new CloudRuntimeException("Failed to deploy VM. Zone " + dc.getName() + " is dedicated . Please use Explicit Dedication Affinity Group"); } List podsInDc = _podDao.listByDataCenterId(dc.getId());