etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable this for now - causes too much grief 

Is also the root cause of the status UNKNOWN
This commit is contained in:
Ian Southam 2015-02-26 17:09:13 +01:00 committed by wilderrodrigues
parent 585f5f7000
commit c38f0b91e3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -1104,7 +1104,7 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
} else {
// Wilder Rodrigues (wrodrigues@schubergphilis.com
// Force a restart in order to fix the conflict
recoverRedundantNetwork(masterRouter, r);
// recoverRedundantNetwork(masterRouter, r);
break;
}
} else if (r.getRedundantState() == RedundantState.BACKUP) {
@ -1113,7 +1113,7 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
} else {
// Wilder Rodrigues (wrodrigues@schubergphilis.com
// Do we have 2 routers in Backup state? Perhaps a restart of 1 router is needed.
recoverRedundantNetwork(backupRouter, r);
// recoverRedundantNetwork(backupRouter, r);
break;
}
}
@ -2746,4 +2746,4 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
public boolean completeAggregatedExecution(final Network network, final List<DomainRouterVO> routers) throws AgentUnavailableException, ResourceUnavailableException {
return aggregationExecution(Action.Finish, network, routers);
}
}
}