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/10/10 20:39:36 UTC
git commit: updated refs/heads/hyperv to 0d424d1
Updated Branches:
refs/heads/hyperv c2ddf836b -> 0d424d152
Acquire management/pod ip for control ip when VR deploys in HyperV
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0d424d15
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0d424d15
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0d424d15
Branch: refs/heads/hyperv
Commit: 0d424d152e5736bc32b16cc81e7ef31dbbc48657
Parents: c2ddf83
Author: Rajesh Battala <ra...@citrix.com>
Authored: Thu Oct 10 23:46:56 2013 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Fri Oct 11 00:02:46 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/guru/ControlNetworkGuru.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0d424d15/server/src/com/cloud/network/guru/ControlNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/ControlNetworkGuru.java b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
index 1943e16..a5b7c88 100755
--- a/server/src/com/cloud/network/guru/ControlNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
@@ -133,7 +133,9 @@ public class ControlNetworkGuru extends PodBasedNetworkGuru implements NetworkGu
InsufficientAddressCapacityException {
assert nic.getTrafficType() == TrafficType.Control;
- if (dest.getHost().getHypervisorType() == HypervisorType.VMware && isRouterVm(vm)) {
+ // we have to get management/private ip for the control nic for vmware/hyperv due ssh issues.
+ HypervisorType hType = dest.getHost().getHypervisorType();
+ if ( ( (hType == HypervisorType.VMware) || (hType == HypervisorType.Hyperv) )&& isRouterVm(vm)) {
if(dest.getDataCenter().getNetworkType() != NetworkType.Basic) {
super.reserve(nic, config, vm, dest, context);