From a63fd39cd8ed5c1163431aee143933540f827e49 Mon Sep 17 00:00:00 2001 From: Rajesh Battala Date: Sun, 22 Dec 2013 17:00:48 +0530 Subject: [PATCH] CLOUDSTACK-5592 ssh should run on eth1 interface in ssvm/cpvm running in HyperV. --- .../src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 5 +++++ .../cloud/storage/secondary/SecondaryStorageManagerImpl.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index c5517c5a07a..8a31d73fba0 100755 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -1444,6 +1444,11 @@ VirtualMachineGuru, SystemVmLoadScanHandler, ResourceStateAdapter { controlNic = managementNic; } + // verify ssh access on management nic for system vm running on HyperV + if(profile.getHypervisorType() == HypervisorType.Hyperv) { + controlNic = managementNic; + } + CheckSshCommand check = new CheckSshCommand(profile.getInstanceName(), controlNic.getIp4Address(), 3922); cmds.addCommand("checkSsh", check); diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java index fb44b800d42..a3f837b7086 100755 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java @@ -1140,6 +1140,11 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar controlNic = managementNic; } + // verify ssh access on management nic for system vm running on HyperV + if(profile.getHypervisorType() == HypervisorType.Hyperv) { + controlNic = managementNic; + } + CheckSshCommand check = new CheckSshCommand(profile.getInstanceName(), controlNic.getIp4Address(), 3922); cmds.addCommand("checkSsh", check);