diff options
author | Jenkins <jenkins@review.openstack.org> | 2012-06-27 22:54:27 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2012-06-27 22:54:27 +0000 |
commit | 8188d6e6b1e70715d851962188250e21b1a7aaa7 (patch) | |
tree | 17b26eee2356707cb0ad895d9597bea669a6ebb2 | |
parent | 82c4a51590b39e1124b4ef728fc77fd1b3e215bf (diff) | |
parent | a590d086ff5e6fdb0fbe88dd27a9bbe619e4fa85 (diff) | |
download | nova-8188d6e6b1e70715d851962188250e21b1a7aaa7.tar.gz nova-8188d6e6b1e70715d851962188250e21b1a7aaa7.tar.xz nova-8188d6e6b1e70715d851962188250e21b1a7aaa7.zip |
Merge "Swap VDI now uses correct name label."
-rw-r--r-- | nova/virt/xenapi/vm_utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 64a479fe1..24ecaaeb0 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -322,7 +322,7 @@ def create_vdi(session, sr_ref, info, disk_type, virtual_size, # hence information about instance may or may not be present otherconf = {} if not isinstance(info, basestring): - name_label = info['display_name'] + name_label = info['name'] otherconf = {'nova_instance_uuid': info['uuid'], 'nova_disk_type': disk_type} else: |