From c3488a51db4bce4ec32c09e6fef78193d360cf3f Mon Sep 17 00:00:00 2001 From: Henko Date: Tue, 13 Mar 2018 18:27:51 +0200 Subject: [PATCH] CLOUDSTACK-10147 Disabled Xenserver Cluster can still deploy VM's. Added code to skip disabled clusters when selecting a host (#2442) --- .../java/com/cloud/deploy/DeploymentPlanningManagerImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java index cc244ce41ba..5d8ad0a7051 100644 --- a/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java +++ b/server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java @@ -1040,6 +1040,11 @@ StateListener { for (Long clusterId : clusterList) { ClusterVO clusterVO = _clusterDao.findById(clusterId); + if (clusterVO.getAllocationState() == Grouping.AllocationState.Disabled) { + s_logger.debug("Cannot deploy in disabled cluster " + clusterId + ", skipping this cluster"); + avoid.addCluster(clusterVO.getId()); + } + if (clusterVO.getHypervisorType() != vmProfile.getHypervisorType()) { s_logger.debug("Cluster: " + clusterId + " has HyperVisorType that does not match the VM, skipping this cluster"); avoid.addCluster(clusterVO.getId());