From d42ed58f7970b63f413c937469266b3cea215c76 Mon Sep 17 00:00:00 2001 From: Hengqing Hu Date: Mon, 2 Jul 2012 12:21:30 +0800 Subject: [PATCH] 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 --- nova/compute/api.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nova/compute/api.py b/nova/compute/api.py index 557dbb930715..4fede37b2ad5 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,