Updated Branches: refs/heads/master 1300fc812 -> 70ca58149
CLOUDSTACK-2772: Programming firewall rules to VR when recovering redundant network Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/70ca5814 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/70ca5814 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/70ca5814 Branch: refs/heads/master Commit: 70ca581499b00db2199f8d9b30fb72eef53f8b2d Parents: 1300fc8 Author: Sheng Yang <[email protected]> Authored: Thu May 30 14:10:18 2013 -0700 Committer: Sheng Yang <[email protected]> Committed: Thu May 30 14:10:18 2013 -0700 ---------------------------------------------------------------------- .../router/VirtualNetworkApplianceManagerImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/70ca5814/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index b8b8860..c71d037 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -1179,7 +1179,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V _alertMgr.sendAlert(AlertManager.ALERT_TYPE_DOMAIN_ROUTER, backupRouter.getDataCenterId(), backupRouter.getPodIdToDeployIn(), title, title); try { - rebootRouter(backupRouter.getId(), false); + rebootRouter(backupRouter.getId(), true); } catch (ConcurrentOperationException e) { s_logger.warn("Fail to reboot " + backupRouter.getInstanceName(), e); } catch (ResourceUnavailableException e) {
