diff options
| author | Chuck Short <zulcss@ubuntu.com> | 2011-03-15 16:21:06 -0400 |
|---|---|---|
| committer | Chuck Short <zulcss@ubuntu.com> | 2011-03-15 16:21:06 -0400 |
| commit | da7800d77dbdfd754f6326f37b2b9f566bc07ac4 (patch) | |
| tree | 239ee0453636de326f66aca3f486ceec6d529f50 /nova/virt | |
| parent | 3c10c1ee1bcc3f3aad90e4e28761d1413ab203a9 (diff) | |
| parent | d36b4d5f3797521b1c2d13a0d30fe98a0671768e (diff) | |
Merge trunk
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index f07b57796..763c5fe40 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -136,8 +136,7 @@ class VMHelper(HelperBase): 'VCPUs_at_startup': vcpus, 'VCPUs_max': vcpus, 'VCPUs_params': {}, - 'xenstore_data': {} - } + 'xenstore_data': {}} # Complete VM configuration record according to the image type # non-raw/raw with PV kernel/raw in HVM mode |