From b07ff145b339ebd978e042cebf6322967b1eb425 Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Fri, 14 Nov 2014 10:58:49 +0100 Subject: [PATCH] Call planDeploymentRouters in the same place as we do in master --- .../network/router/deployment/RouterDeploymentDefinition.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java b/server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java index f8d3011ada7..be1246eaff5 100644 --- a/server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java +++ b/server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java @@ -202,7 +202,6 @@ public class RouterDeploymentDefinition { for (final DeployDestination destination : destinations) { dest = destination; - planDeploymentRouters(); generateDeploymentPlan(); executeDeployment(); } @@ -334,8 +333,8 @@ public class RouterDeploymentDefinition { */ protected void executeDeployment() throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException { - //Check current redundant routers, if possible(all routers are stopped), reset the priority + planDeploymentRouters(); setupPriorityOfRedundantRouter(); if (getNumberOfRoutersToDeploy() > 0 && prepareDeployment()) {