summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-28 01:56:27 +0000
committerGerrit Code Review <review@openstack.org>2013-06-28 01:56:27 +0000
commita11a723ee16e325505851d32466e4615c7d60017 (patch)
treee6e0c296bc104fbcd1ff28294f7a863bc0e8e106
parent368efa77959cf7c5167045a491887f68d28f2d4e (diff)
parent8f6419301e56f7104bc9ac76dcd2ba5aeed0cb43 (diff)
Merge "No support for double nested 64 bit guest using VCDriver"
-rw-r--r--nova/virt/vmwareapi/vm_util.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/virt/vmwareapi/vm_util.py b/nova/virt/vmwareapi/vm_util.py
index fecac5bcc..117669700 100644
--- a/nova/virt/vmwareapi/vm_util.py
+++ b/nova/virt/vmwareapi/vm_util.py
@@ -50,6 +50,10 @@ def get_vm_create_spec(client_factory, instance, data_store_name,
config_spec.name = instance['uuid']
config_spec.guestId = os_type
+ # Allow nested ESX instances to host 64 bit VMs.
+ if os_type == "vmkernel5Guest":
+ config_spec.nestedHVEnabled = "True"
+
vm_file_info = client_factory.create('ns0:VirtualMachineFileInfo')
vm_file_info.vmPathName = "[" + data_store_name + "]"
config_spec.files = vm_file_info