openstack
/
nova
Code Issues Proposed changes

Merge "Remove "or 'reserved'" condition from reserve_block_device_name"

This commit is contained in:
Jenkins 2016-01-14 06:23:16 +00:00 committed by Gerrit Code Review
parent 364b5fa556 ecb8cbe34c
commit 523e8ed5c0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/compute/manager.py
View File

@ -4636,7 +4636,7 @@ class ComputeManager(manager.Manager):
context=context,
source_type='volume', destination_type='volume',
instance_uuid=instance.uuid, boot_index=None,
volume_id=volume_id or 'reserved',
volume_id=volume_id,
device_name=device, guest_format=None,
disk_bus=disk_bus, device_type=device_type)