Repository: cloudstack Updated Branches: refs/heads/master 131dca84d -> 24aaf1923
Revert "CLOUDSTACK-7919: If there is an out of band movement for the VR, irrespective of the fact that came as out of band live migrate or HA, reboot the router to make sure the router has all the rules configured." This reverts commit 39a671dfd889148d69d2f75285d194a4705c35cc. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24aaf192 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24aaf192 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24aaf192 Branch: refs/heads/master Commit: 24aaf19239eb63ff0dae894cefbf02135fd7b293 Parents: 131dca8 Author: Nitin Mehta <nitin.me...@citrix.com> Authored: Fri Dec 5 15:24:09 2014 +0530 Committer: Nitin Mehta <nitin.me...@citrix.com> Committed: Fri Dec 5 15:24:09 2014 +0530 ---------------------------------------------------------------------- .../cloud/network/router/VirtualNetworkApplianceManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24aaf192/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 ba76e57..c80b225 100644 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -2574,7 +2574,7 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> { public boolean postStateTransitionEvent(final StateMachine2.Transition<State, VirtualMachine.Event> transition, final VirtualMachine vo, final boolean status, final Object opaque) { final State newState = transition.getToState(); final VirtualMachine.Event event = transition.getEvent(); - if (event == VirtualMachine.Event.FollowAgentPowerOnReport && newState == State.Running) { + if (oldState == State.Stopped && event == VirtualMachine.Event.FollowAgentPowerOnReport && newState == State.Running) { if (vo.getType() == VirtualMachine.Type.DomainRouter) { if (opaque != null && opaque instanceof Pair<?, ?>) { Pair<?, ?> pair = (Pair<?, ?>)opaque;
