cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yas...@apache.org
Subject git commit: updated refs/heads/4.2-forward to e1e6f93
Date Thu, 05 Sep 2013 21:56:00 GMT
Updated Branches:
  refs/heads/4.2-forward fb97e8e61 -> e1e6f9330


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


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e1e6f933
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e1e6f933
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e1e6f933

Branch: refs/heads/4.2-forward
Commit: e1e6f93306959dc8799eca00df11587237f1b38d
Parents: fb97e8e
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Thu Sep 5 14:26:52 2013 -0700
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Thu Sep 5 14:55:45 2013 -0700

----------------------------------------------------------------------
 .../network/router/VirtualNetworkApplianceManagerImpl.java    | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e1e6f933/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 a143c0c..816924f 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()));


Mime
View raw message