apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Call planDeploymentRouters in the same place as we do in master

Browse Source
This commit is contained in:
Hugo Trippaers 2014-11-14 10:58:49 +01:00 committed by wilderrodrigues
parent 87855d6bb7
commit b07ff145b3
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java
View File

@ -202,7 +202,6 @@ public class RouterDeploymentDefinition {
for (final DeployDestination destination : destinations) { for (final DeployDestination destination : destinations) {
dest = destination; dest = destination;
planDeploymentRouters();
generateDeploymentPlan(); generateDeploymentPlan();
executeDeployment(); executeDeployment();
} }
@ -334,8 +333,8 @@ public class RouterDeploymentDefinition {
*/ */
protected void executeDeployment() protected void executeDeployment()
throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException { throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException {
//Check current redundant routers, if possible(all routers are stopped), reset the priority //Check current redundant routers, if possible(all routers are stopped), reset the priority
planDeploymentRouters();
setupPriorityOfRedundantRouter(); setupPriorityOfRedundantRouter();
if (getNumberOfRoutersToDeploy() > 0 && prepareDeployment()) { if (getNumberOfRoutersToDeploy() > 0 && prepareDeployment()) {