openstack
/
nova
Code Issues Proposed changes

Merge "Remove duplicate volume_id"

This commit is contained in:
Jenkins 2012-07-02 20:33:04 +00:00 committed by Gerrit Code Review
parent da83fd1246 d42ed58f79
commit 2038e933bd
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova/compute/api.py
View File

@ -570,9 +570,8 @@ class API(base.Base):
# (--block-device-mapping) # (--block-device-mapping)
if virtual_name == 'NoDevice': if virtual_name == 'NoDevice':
values['no_device'] = True values['no_device'] = True
for k in ('delete_on_termination', 'volume_id', for k in ('delete_on_termination', 'virtual_name',
'snapshot_id', 'volume_id', 'volume_size', 'snapshot_id', 'volume_id', 'volume_size'):
'virtual_name'):
values[k] = None values[k] = None
self.db.block_device_mapping_update_or_create(elevated_context, self.db.block_device_mapping_update_or_create(elevated_context,