cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/2] git commit: updated refs/heads/master to d543e2a
Date Mon, 21 Sep 2015 18:05:00 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master a5ca762ac -> d543e2aa2


CLOUDSTACK-8851 Redundant VR getting started in the same cluster or host even when there are
suitable hosts available


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7439a9bb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7439a9bb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7439a9bb

Branch: refs/heads/master
Commit: 7439a9bbec6cd9f7b61ab2035eaf668c9408f674
Parents: 2bd61c3
Author: Bharat Kumar <bharat.kumar@citrix.com>
Authored: Tue Sep 15 14:24:13 2015 +0530
Committer: Bharat Kumar <bharat.kumar@citrix.com>
Committed: Tue Sep 15 14:24:13 2015 +0530

----------------------------------------------------------------------
 engine/orchestration/src/com/cloud/vm/VmWorkStart.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7439a9bb/engine/orchestration/src/com/cloud/vm/VmWorkStart.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkStart.java b/engine/orchestration/src/com/cloud/vm/VmWorkStart.java
index bb9f375..814e78c 100644
--- a/engine/orchestration/src/com/cloud/vm/VmWorkStart.java
+++ b/engine/orchestration/src/com/cloud/vm/VmWorkStart.java
@@ -56,7 +56,7 @@ public class VmWorkStart extends VmWork {
 
     public DeploymentPlan getPlan() {
 
-        if (podId != null || clusterId != null || hostId != null || poolId != null || physicalNetworkId
!= null) {
+        if (podId != null || clusterId != null || hostId != null || poolId != null || physicalNetworkId
!= null || avoids !=null) {
             // this is ugly, to work with legacy code, we need to re-construct the DeploymentPlan
hard-codely
             // this has to be refactored together with migrating legacy code into the new
way
             ReservationContext context = null;
@@ -70,6 +70,7 @@ public class VmWorkStart extends VmWork {
             DeploymentPlan plan = new DataCenterDeployment(
                     dcId, podId, clusterId, hostId, poolId, physicalNetworkId,
                     context);
+            plan.setAvoids(avoids);
             return plan;
         }
 


Mime
View raw message