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/4.2 to 32fd0c9
Date Mon, 12 Aug 2013 09:52:23 GMT
Updated Branches:
  refs/heads/4.2 6decb9cb4 -> 32fd0c94a


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/32fd0c94
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/32fd0c94
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/32fd0c94

Branch: refs/heads/4.2
Commit: 32fd0c94a2bd9fc902f9de06bfe1e55b5681ba33
Parents: 6decb9c
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:51:41 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/32fd0c94/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 891adbe..4a57285 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
@@ -2698,7 +2698,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