You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/12/22 04:32:13 UTC
[1/2] git commit: updated refs/heads/4.9 to 743dd42
Repository: cloudstack
Updated Branches:
refs/heads/4.9 f68b6e831 -> 743dd4249
CLOUDSTACK-9683: system.vm.default.hypervisor will pin the hypervisor for VR too with this fix
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ca8a0044
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ca8a0044
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ca8a0044
Branch: refs/heads/4.9
Commit: ca8a00442c260e0f86079b1cde71cf06291e7fa4
Parents: de7a06e
Author: Abhinandan Prateek <ap...@apache.org>
Authored: Mon Dec 19 13:06:02 2016 +0530
Committer: Abhinandan Prateek <ap...@apache.org>
Committed: Mon Dec 19 13:06:02 2016 +0530
----------------------------------------------------------------------
.../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java | 3 ++-
server/src/com/cloud/network/guru/ControlNetworkGuru.java | 2 +-
server/src/com/cloud/network/router/NetworkHelperImpl.java | 1 -
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ca8a0044/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 2ddf8c2..bea98cb 100644
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -977,6 +977,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
_uservmDetailsDao.addDetail(vm.getId(), "cpuOvercommitRatio", cluster_detail_cpu.getValue(), true);
_uservmDetailsDao.addDetail(vm.getId(), "memoryOvercommitRatio", cluster_detail_ram.getValue(), true);
}
+
vmProfile.setCpuOvercommitRatio(Float.parseFloat(cluster_detail_cpu.getValue()));
vmProfile.setMemoryOvercommitRatio(Float.parseFloat(cluster_detail_ram.getValue()));
StartAnswer startAnswer = null;
@@ -993,7 +994,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
if (s_logger.isDebugEnabled()) {
s_logger.debug("VM is being created in podId: " + vm.getPodIdToDeployIn());
}
- _networkMgr.prepare(vmProfile, dest, ctx);
+ _networkMgr.prepare(vmProfile, new DeployDestination(dest.getDataCenter(), dest.getPod(), null, null), ctx);
if (vm.getHypervisorType() != HypervisorType.BareMetal) {
volumeMgr.prepare(vmProfile, dest);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ca8a0044/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 4e3a981..e3aabc1 100644
--- a/server/src/com/cloud/network/guru/ControlNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
@@ -136,7 +136,7 @@ public class ControlNetworkGuru extends PodBasedNetworkGuru implements NetworkGu
assert nic.getTrafficType() == TrafficType.Control;
// we have to get management/private ip for the control nic for vmware/hyperv due ssh issues.
- HypervisorType hType = dest.getHost().getHypervisorType();
+ HypervisorType hType = vm.getHypervisorType();
if (((hType == HypervisorType.VMware) || (hType == HypervisorType.Hyperv)) && isRouterVm(vm)) {
if (dest.getDataCenter().getNetworkType() != NetworkType.Basic) {
super.reserve(nic, config, vm, dest, context);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ca8a0044/server/src/com/cloud/network/router/NetworkHelperImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/NetworkHelperImpl.java b/server/src/com/cloud/network/router/NetworkHelperImpl.java
index f396fdd..12ef0f9 100644
--- a/server/src/com/cloud/network/router/NetworkHelperImpl.java
+++ b/server/src/com/cloud/network/router/NetworkHelperImpl.java
@@ -544,7 +544,6 @@ public class NetworkHelperImpl implements NetworkHelper {
protected List<HypervisorType> getHypervisors(final RouterDeploymentDefinition routerDeploymentDefinition) throws InsufficientServerCapacityException {
final DeployDestination dest = routerDeploymentDefinition.getDest();
List<HypervisorType> hypervisors = new ArrayList<HypervisorType>();
-
if (dest.getCluster() != null) {
if (dest.getCluster().getHypervisorType() == HypervisorType.Ovm) {
hypervisors.add(getClusterToStartDomainRouterForOvm(dest.getCluster().getPodId()));
[2/2] git commit: updated refs/heads/4.9 to 743dd42
Posted by bh...@apache.org.
Merge pull request #1839 from shapeblue/CLOUDSTACK-9683
CLOUDSTACK-9683: system.vm.default.hypervisor will pin the hypervisor for VR too with this fix
* pr/1839:
CLOUDSTACK-9683: system.vm.default.hypervisor will pin the hypervisor for VR too with this fix
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/743dd424
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/743dd424
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/743dd424
Branch: refs/heads/4.9
Commit: 743dd4249cc813fbd30a130bb10fb17158ae92f5
Parents: f68b6e8 ca8a004
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Dec 22 10:01:52 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 22 10:01:52 2016 +0530
----------------------------------------------------------------------
.../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java | 3 ++-
server/src/com/cloud/network/guru/ControlNetworkGuru.java | 2 +-
server/src/com/cloud/network/router/NetworkHelperImpl.java | 1 -
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------