summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-11-01 10:17:12 +0000
committerGerrit Code Review <review@openstack.org>2012-11-01 10:17:12 +0000
commit3b2e0c6009e60d2a77844dcbce3f9be53e931fbb (patch)
tree513d1bafce83cff6b184db77696c67f6ed748146 /nova/compute
parent7db75002668dfc9d91914feaea67f49f947099b9 (diff)
parentef0726425c52784ade6aa26a8cd3f01729dc59c5 (diff)
Merge "Fix copy-paste bug in block_device_info_generation"
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/api.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 601b75e86..9e5971862 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -1419,7 +1419,7 @@ class API(base.Base):
if cinfo and 'serial' not in cinfo:
cinfo['serial'] = bdm['volume_id']
bdmap = {'connection_info': cinfo,
- 'mount_device': bdm['volume_id'],
+ 'mount_device': bdm['device_name'],
'delete_on_termination': bdm['delete_on_termination']}
block_device_mapping.append(bdmap)
except TypeError: