diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-13 06:32:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-13 06:32:29 +0000 |
| commit | e1f76a154214bae795b48aa3008ff8f4a62d6856 (patch) | |
| tree | 8980d77009f082ec3b0b8bad26d51ab8777afac9 | |
| parent | fd4388c68da3a25a67dbc89ad14ced01f85c5025 (diff) | |
| parent | 8ddbbf095136333cb9f2f4c7d60e37f70c759776 (diff) | |
| download | nova-e1f76a154214bae795b48aa3008ff8f4a62d6856.tar.gz nova-e1f76a154214bae795b48aa3008ff8f4a62d6856.tar.xz nova-e1f76a154214bae795b48aa3008ff8f4a62d6856.zip | |
Merge "Move allowvssprovider=false to vm-data field"
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 60613b5c9..97e9e87f8 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -230,8 +230,7 @@ def create_vm(session, instance, name_label, kernel, ramdisk, 'memory_target': mem, 'name_description': '', 'name_label': name_label, - 'other_config': {'allowvssprovider': str(False), - 'nova_uuid': str(instance['uuid'])}, + 'other_config': {'nova_uuid': str(instance['uuid'])}, 'PCI_bus': '', 'platform': {'acpi': 'true', 'apic': 'true', 'pae': 'true', 'viridian': 'true', 'timeoffset': '0'}, @@ -247,7 +246,7 @@ def create_vm(session, instance, name_label, kernel, ramdisk, 'VCPUs_at_startup': vcpus, 'VCPUs_max': vcpus, 'VCPUs_params': {}, - 'xenstore_data': {}} + 'xenstore_data': {'allowvssprovider': 'false'}} # Complete VM configuration record according to the image type # non-raw/raw with PV kernel/raw in HVM mode |