summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHengqing Hu <hudayou@hotmail.com>2012-07-02 12:21:30 +0800
committerHengqing Hu <hudayou@hotmail.com>2012-07-02 12:21:30 +0800
commitd42ed58f7970b63f413c937469266b3cea215c76 (patch)
tree47cc348c027f90c89a7515f764b4c5d8e3a4fde2
parent019d953ef5b4bed7c53401375bfd7aa890fc0c1d (diff)
Remove duplicate volume_id
Remove duplicate key 'volume_id' in a for loop in _update_block_device_mapping in nova.compute.api Change-Id: I43e51cb077334818abea0c1d3bdda4b761406ea4
-rw-r--r--nova/compute/api.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 557dbb930..4fede37b2 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -570,9 +570,8 @@ class API(base.Base):
# (--block-device-mapping)
if virtual_name == 'NoDevice':
values['no_device'] = True
- for k in ('delete_on_termination', 'volume_id',
- 'snapshot_id', 'volume_id', 'volume_size',
- 'virtual_name'):
+ for k in ('delete_on_termination', 'virtual_name',
+ 'snapshot_id', 'volume_id', 'volume_size'):
values[k] = None
self.db.block_device_mapping_update_or_create(elevated_context,