From 29c758c062b33ae8afb438a3e3351fc5b28e3bb5 Mon Sep 17 00:00:00 2001 From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com> Date: Sat, 25 May 2019 22:48:04 +0200 Subject: [PATCH 1/2] Update vmware reservations description we do NOT always reserve VMware CPU/RAM resources - only when this setting is set to TRUE - verified for both system VMs and user VMs. --- .../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 10c3feb2609e..49c42f6f5b42 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 @@ protected VMwareGuru() { } public static final ConfigKey VmwareReserveCpu = new ConfigKey(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 not overprovisioning.", true, ConfigKey.Scope.Cluster, null); public static final ConfigKey VmwareReserveMemory = new ConfigKey(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 not overprovisioning.", true, ConfigKey.Scope.Cluster, null); protected ConfigKey VmwareEnableNestedVirtualization = new ConfigKey(Boolean.class, "vmware.nested.virtualization", "Advanced", "false", From d59fb30f3ab6b83d34885bc5034377eb0bb326f5 Mon Sep 17 00:00:00 2001 From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com> Date: Sat, 25 May 2019 22:56:25 +0200 Subject: [PATCH 2/2] Update VMwareGuru.java --- .../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 49c42f6f5b42..4777b7383917 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 @@ protected VMwareGuru() { } public static final ConfigKey VmwareReserveCpu = new ConfigKey(Boolean.class, "vmware.reserve.cpu", "Advanced", "false", - "Specify whether or not to reserve CPU when not overprovisioning.", true, ConfigKey.Scope.Cluster, + "Specify whether or not to reserve CPU when deploying an instance.", true, ConfigKey.Scope.Cluster, null); public static final ConfigKey VmwareReserveMemory = new ConfigKey(Boolean.class, "vmware.reserve.mem", "Advanced", "false", - "Specify whether or not to reserve memory when not overprovisioning.", true, + "Specify whether or not to reserve memory when deploying an instance.", true, ConfigKey.Scope.Cluster, null); protected ConfigKey VmwareEnableNestedVirtualization = new ConfigKey(Boolean.class, "vmware.nested.virtualization", "Advanced", "false",