rebase fixes

Author: sureshanaparti

server/src/main/java/com/cloud/network/SshKeysDistriMonitor.java

@@ -96,13 +96,12 @@ public void processConnect(Host host, StartupCommand cmd, boolean forRebalance)
             String pubKey = _configDao.getValue("ssh.publickey");
             String prvKey = _configDao.getValue("ssh.privatekey");
 
-                try {
-                    ModifySshKeysCommand cmds = new ModifySshKeysCommand(pubKey, prvKey);
-                    Commands c = new Commands(cmds);
-                    _agentMgr.send(host.getId(), c, this);
-                } catch (AgentUnavailableException e) {
-                    logger.debug("Failed to send keys to agent: {}", host);
-                }
+            try {
+                ModifySshKeysCommand cmds = new ModifySshKeysCommand(pubKey, prvKey);
+                Commands c = new Commands(cmds);
+                _agentMgr.send(host.getId(), c, this);
+            } catch (AgentUnavailableException e) {
+                logger.debug("Failed to send keys to agent: {}", host);
             }
         }
     }

server/src/main/java/com/cloud/storage/listener/StoragePoolMonitor.java

@@ -127,20 +127,19 @@ public void processConnect(Host host, StartupCommand cmd, boolean forRebalance)
                     continue;
                 }
 
-                    if (pool.getPoolType() == StoragePoolType.OCFS2 && !_ocfs2Mgr.prepareNodes(pool.getClusterId())) {
-                        throw new ConnectionException(true, String.format("Unable to prepare OCFS2 nodes for pool %s", pool));
-                    }
+                if (pool.getPoolType() == StoragePoolType.OCFS2 && !_ocfs2Mgr.prepareNodes(pool.getClusterId())) {
+                    throw new ConnectionException(true, String.format("Unable to prepare OCFS2 nodes for pool %s", pool));
+                }
 
-                    Long hostId = host.getId();
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("Host {} connected, connecting host to shared pool {} and sending storage pool information ...", host, pool);
-                    }
-                    try {
-                        _storageManager.connectHostToSharedPool(host, pool.getId());
-                        _storageManager.createCapacityEntry(pool.getId());
-                    } catch (Exception e) {
-                        throw new ConnectionException(true, String.format("Unable to connect host %s to storage pool %s due to %s", host, pool, e.toString()), e);
-                    }
+                Long hostId = host.getId();
+                if (logger.isDebugEnabled()) {
+                    logger.debug("Host {} connected, connecting host to shared pool {} and sending storage pool information ...", host, pool);
+                }
+                try {
+                    _storageManager.connectHostToSharedPool(host, pool.getId());
+                    _storageManager.createCapacityEntry(pool.getId());
+                } catch (Exception e) {
+                    throw new ConnectionException(true, String.format("Unable to connect host %s to storage pool %s due to %s", host, pool, e.toString()), e);
                 }
             }
         }