send password only to master router

Author: bvbharatk

server/src/com/cloud/network/element/VirtualRouterElement.java

@@ -775,43 +775,33 @@ public boolean savePassword(final Network network, final NicProfile nic, final V
         }
 
         final VirtualMachineProfile uservm = vm;
-
         final DataCenterVO dcVO = _dcDao.findById(network.getDataCenterId());
         final NetworkTopology networkTopology = networkTopologyContext.retrieveNetworkTopology(dcVO);
 
-        // If any router is not running then save the password in DB
-        List<VirtualRouter> routerList = new ArrayList<VirtualRouter>();
-        //applied true implies we have applied the password successfully on at
-        //least one router. save true implies we have to save the password to send
-        //it to the remaining routers.
-        Boolean applied = true, save = false;
-        for (final VirtualRouter router : routers) {
-            if (router.getState() == State.Running) {
-                routerList.add(router);
-            } else {
-                save = true;
-            }
+        if (!network.isRedundant()) {
+            return networkTopology.savePasswordToRouter(network, nic, uservm, routers.get(0));
         }
-        for (VirtualRouter router : routerList) {
-            applied = networkTopology.savePasswordToRouter(network, nic, uservm, router);
-            if (!applied)
-                 break;
+
+        for (final VirtualRouter router : routers) {
+                if (router.getState() == State.Running && router.getRedundantState() == VirtualRouter.RedundantState.MASTER) {
+                    return networkTopology.savePasswordToRouter(network, nic, uservm, router);
+                }
         }
-        if (save && applied) {
-            final String password = (String) uservm.getParameter(VirtualMachineProfile.Param.VmPassword);
-            final String password_encrypted = DBEncryptionUtil.encrypt(password);
-            final UserVmVO userVmVO = _userVmDao.findById(vm.getId());
+       return savePassword(uservm);
+    }
 
-            _userVmDao.loadDetails(userVmVO);
-            userVmVO.setDetail("password", password_encrypted);
-            _userVmDao.saveDetails(userVmVO);
+    private boolean savePassword(VirtualMachineProfile uservm) {
+        //save password
+        final String password = (String) uservm.getParameter(VirtualMachineProfile.Param.VmPassword);
+        final String password_encrypted = DBEncryptionUtil.encrypt(password);
+        final UserVmVO userVmVO = _userVmDao.findById(uservm.getId());
 
-            userVmVO.setUpdateParameters(true);
-            _userVmDao.update(userVmVO.getId(), userVmVO);
-        }
-        if (!applied) {
-            return false;
-        }
+        _userVmDao.loadDetails(userVmVO);
+        userVmVO.setDetail("password", password_encrypted);
+        _userVmDao.saveDetails(userVmVO);
+
+        userVmVO.setUpdateParameters(true);
+        _userVmDao.update(userVmVO.getId(), userVmVO);
         return true;
     }
 

server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java

@@ -61,13 +61,17 @@ public class AdvancedNetworkVisitor extends BasicNetworkVisitor {
     @Override
     public boolean visit(final UserdataPwdRules userdata) throws ResourceUnavailableException {
         final VirtualRouter router = userdata.getRouter();
-
         final Commands commands = new Commands(Command.OnError.Stop);
         final VirtualMachineProfile profile = userdata.getProfile();
         final NicVO nicVo = userdata.getNicVo();
         final UserVmVO userVM = userdata.getUserVM();
 
-        _commandSetupHelper.createPasswordCommand(router, profile, nicVo, commands);
+        if (!router.getIsRedundantRouter() && router.getVpcId() == null && router.getRedundantState() == VirtualRouter.RedundantState.MASTER) {
+            _commandSetupHelper.createPasswordCommand(router, profile, nicVo, commands);
+        }else if (!router.getIsRedundantRouter() || router.getVpcId()!= null){
+            _commandSetupHelper.createPasswordCommand(router, profile, nicVo, commands);
+        }
+
         _commandSetupHelper.createVmDataCommand(router, userVM, nicVo, userVM.getDetail("SSH.PublicKey"), commands);
 
         return _networkGeneralHelper.sendCommandsToRouter(router, commands);