This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new 964430a vmware: update vmware reservations settings description
(#3358)
964430a is described below
commit 964430ab23656323112552e5cc4c1c9198bfc56a
Author: Andrija Panic <[email protected]>
AuthorDate: Thu May 30 12:47:48 2019 +0200
vmware: update vmware reservations settings description (#3358)
We do NOT always reserve VMware CPU/RAM resources - only when
"vmware.reserve.cpu" or "vmware.reserve.mem" setting is set to TRUE - AND we do
so, irrelevant if overprovisioning is active or not. Verified for both system
VMs and user VMs.
---
.../vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java
b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java
index 10c3feb..4777b73 100644
---
a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java
+++
b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java
@@ -157,11 +157,11 @@ public class VMwareGuru extends HypervisorGuruBase
implements HypervisorGuru, Co
}
public static final ConfigKey<Boolean> VmwareReserveCpu = new
ConfigKey<Boolean>(Boolean.class, "vmware.reserve.cpu", "Advanced", "false",
- "Specify whether or not to reserve CPU when not overprovisioning, In
case of cpu overprovisioning we will always reserve cpu.", true,
ConfigKey.Scope.Cluster,
+ "Specify whether or not to reserve CPU when deploying an instance.",
true, ConfigKey.Scope.Cluster,
null);
public static final ConfigKey<Boolean> VmwareReserveMemory = new
ConfigKey<Boolean>(Boolean.class, "vmware.reserve.mem", "Advanced", "false",
- "Specify whether or not to reserve memory when not overprovisioning,
In case of memory overprovisioning we will always reserve memory.", true,
+ "Specify whether or not to reserve memory when deploying an
instance.", true,
ConfigKey.Scope.Cluster, null);
protected ConfigKey<Boolean> VmwareEnableNestedVirtualization = new
ConfigKey<Boolean>(Boolean.class, "vmware.nested.virtualization", "Advanced",
"false",
