cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sate...@apache.org
Subject git commit: updated refs/heads/master to f0ae682
Date Mon, 12 Aug 2013 09:50:48 GMT
Updated Branches:
  refs/heads/master 73d49d090 -> f0ae682d4


CLOUDSTACK-4246 VM deployment fails with global configuration parameter "vmware.nested.virtualization"
enabled.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f0ae682d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f0ae682d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f0ae682d

Branch: refs/heads/master
Commit: f0ae682d483e474ca4b97fa9afb5c2db8e84ec04
Parents: 73d49d0
Author: Sateesh Chodapuneedi <sateesh@apache.org>
Authored: Mon Aug 12 09:44:33 2013 +0530
Committer: Sateesh Chodapuneedi <sateesh@apache.org>
Committed: Mon Aug 12 09:44:33 2013 +0530

----------------------------------------------------------------------
 .../com/cloud/hypervisor/vmware/resource/VmwareResource.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f0ae682d/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index c61e171..a76794f 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2680,7 +2680,10 @@ public class VmwareResource implements StoragePoolResource, ServerResource,
Vmwa
                         context.getVimClient().getMoRefProp(computeMor, "environmentBrowser");
                 HostCapability hostCapability = context.getService().queryTargetCapabilities(environmentBrowser,
hostMor);
                 Boolean nestedHvSupported = hostCapability.isNestedHVSupported();
-                if (nestedHvSupported != null && nestedHvSupported.booleanValue())
{
+                if (nestedHvSupported == null) {
+                    // nestedHvEnabled property is supported only since VMware 5.1. It's
not defined for earlier versions.
+                    s_logger.warn("Hypervisor doesn't support nested virtualization, unable
to set config for VM " +vmSpec.getName());
+                } else if (nestedHvSupported.booleanValue()) {
                     s_logger.debug("Hypervisor supports nested virtualization, enabling for
VM " + vmSpec.getName());
                     vmConfigSpec.setNestedHVEnabled(true);
                 }


Mime
View raw message