From e1e6f93306959dc8799eca00df11587237f1b38d Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Thu, 5 Sep 2013 14:26:52 -0700 Subject: [PATCH] Revert "CLOUDSTACK-2792: Send "saved_password" to BACKUP router when reset password for user VM" This reverts commit 5a8a2a259ea6e049b3e5810ff3a432d6ca7767e1. We would fix it in another way, since mgmt server may get state updated in time. Conflicts: server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java --- .../network/router/VirtualNetworkApplianceManagerImpl.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index a143c0c2b23..816924fcce9 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -3378,12 +3378,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V // password should be set only on default network element if (password != null && nic.isDefaultNic()) { - String encodedPassword = PasswordGenerator.rot13(password); - // We would unset password for BACKUP router in the RvR, to prevent user from accidently reset the - // password again after BACKUP become MASTER - if (router.getIsRedundantRouter() && router.getRedundantState() != RedundantState.MASTER) { - encodedPassword = PasswordGenerator.rot13("saved_password"); - } + final String encodedPassword = PasswordGenerator.rot13(password); SavePasswordCommand cmd = new SavePasswordCommand(encodedPassword, nic.getIp4Address(), profile.getVirtualMachine().getHostName(), _networkModel.getExecuteInSeqNtwkElmtCmd()); cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId())); cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, getRouterIpInNetwork(nic.getNetworkId(), router.getId()));