diff options
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index aacfdf7a7..7720b3190 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -430,9 +430,10 @@ class ComputeManager(manager.SchedulerDependentManager): self.db.block_device_mapping_update( context, bdm['id'], {'connection_info': jsonutils.dumps(cinfo)}) - block_device_mapping.append({'connection_info': cinfo, - 'mount_device': - bdm['device_name']}) + bdmap = {'connection_info': cinfo, + 'mount_device': bdm['device_name'], + 'delete_on_termination': bdm['delete_on_termination']} + block_device_mapping.append(bdmap) return { 'root_device_name': instance['root_device_name'], @@ -685,9 +686,10 @@ class ComputeManager(manager.SchedulerDependentManager): for bdm in bdms: try: cinfo = jsonutils.loads(bdm['connection_info']) - block_device_mapping.append({'connection_info': cinfo, - 'mount_device': - bdm['device_name']}) + bdmap = {'connection_info': cinfo, + 'mount_device': bdm['device_name'], + 'delete_on_termination': bdm['delete_on_termination']} + block_device_mapping.append(bdmap) except TypeError: # if the block_device_mapping has no value in connection_info # (returned as None), don't include in the mapping |