openstack
/
compute-hyperv
Code Issues Proposed changes

Merge "sync: Update renamed method usage"

This commit is contained in:
Zuul 2018-01-17 10:17:59 +00:00 committed by Gerrit Code Review
parent 7a9dd48398 81da493c3e
commit 4d84341387
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compute_hyperv/nova/block_device_manager.py
View File

@ -219,8 +219,9 @@ class BlockDeviceInfoManager(object):
# either booting from volume, or booting from image/iso
root_disk = {}
root_device = (driver.block_device_info_get_root(block_device_info) or
self._DEFAULT_ROOT_DEVICE)
root_device = driver.block_device_info_get_root_device(
block_device_info)
root_device = root_device or self._DEFAULT_ROOT_DEVICE
if self.is_boot_from_volume(block_device_info):
root_volume = self._get_root_device_bdm(