openstack/nova
Code Issues Proposed changes

Merge "Remove unused base_options param from _get_image_defined_bdms"

Browse Source
This commit is contained in:
Jenkins
2016-05-18 23:33:00 +00:00
committed by Gerrit Code Review
parent b56d861d59 6f2a46feb4
commit fe8a119e8d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/compute/api.py
View File

@@ -664,7 +664,7 @@ class API(base.Base):
raise exception.FlavorDiskSmallerThanMinDisk(
flavor_size=dest_size, image_min_disk=image_min_disk)
def _get_image_defined_bdms(self, base_options, instance_type, image_meta,
def _get_image_defined_bdms(self, instance_type, image_meta,
root_device_name):
image_properties = image_meta.get('properties', {})
@@ -739,7 +739,7 @@ class API(base.Base):
raise exception.InvalidRequest(msg)
image_defined_bdms = self._get_image_defined_bdms(
base_options, instance_type, image_meta, root_device_name)
instance_type, image_meta, root_device_name)
root_in_image_bdms = (
block_device.get_root_bdm(image_defined_bdms) is not None)