You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2013/12/22 17:58:57 UTC
[2/7] git commit: updated refs/heads/4.3 to 58aaf67
CLOUDSTACK-5592
ssh should run on eth1 interface in ssvm/cpvm running in HyperV.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a63fd39c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a63fd39c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a63fd39c
Branch: refs/heads/4.3
Commit: a63fd39cd8ed5c1163431aee143933540f827e49
Parents: 35d8b2f
Author: Rajesh Battala <ra...@citrix.com>
Authored: Sun Dec 22 17:00:48 2013 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Sun Dec 22 20:24:15 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 5 +++++
.../cloud/storage/secondary/SecondaryStorageManagerImpl.java | 5 +++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a63fd39c/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index c5517c5..8a31d73 100755
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -1444,6 +1444,11 @@ VirtualMachineGuru, SystemVmLoadScanHandler<Long>, 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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a63fd39c/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
index fb44b80..a3f837b 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);