openstack
/
nova
Code Issues Proposed changes

Merge "rename libvirt has_default_ephemeral"

This commit is contained in:
Jenkins 2016-07-13 04:24:03 +00:00 committed by Gerrit Code Review
parent 29992216ff b05e098919
commit facdef117c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/virt/libvirt/blockinfo.py
View File

@ -473,7 +473,7 @@ def default_device_names(virt_type, context, instance, block_device_info,
driver_bdm.save()
def has_default_ephemeral(instance, disk_bus, block_device_info, mapping):
def get_default_ephemeral_info(instance, disk_bus, block_device_info, mapping):
ephemerals = driver.block_device_info_get_ephemerals(block_device_info)
if instance.ephemeral_gb <= 0 or ephemerals:
return None
@ -559,8 +559,8 @@ def get_disk_mapping(virt_type, instance,
# set, nothing is changed.
update_bdm(root_bdm, root_info)
default_eph = has_default_ephemeral(instance, disk_bus, block_device_info,
mapping)
default_eph = get_default_ephemeral_info(instance, disk_bus,
block_device_info, mapping)
if default_eph:
mapping['disk.local'] = default_eph