diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-02 20:33:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-02 20:33:04 +0000 |
| commit | 2038e933bd8bde659e31b4a78e2211a585e3dcec (patch) | |
| tree | 7d4bb836c84341705c44fec130bee0014a406484 | |
| parent | da83fd1246fceda448bad09b5cd7ae262bc611ee (diff) | |
| parent | d42ed58f7970b63f413c937469266b3cea215c76 (diff) | |
| download | nova-2038e933bd8bde659e31b4a78e2211a585e3dcec.tar.gz nova-2038e933bd8bde659e31b4a78e2211a585e3dcec.tar.xz nova-2038e933bd8bde659e31b4a78e2211a585e3dcec.zip | |
Merge "Remove duplicate volume_id"
| -rw-r--r-- | nova/compute/api.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 3fbaf12df..1e3ebf1f3 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, |