openstack/nova
Code Issues Proposed changes

Merge "Use flavor instead of flavour"

Browse Source
This commit is contained in:
Jenkins 2015-11-19 04:08:51 +00:00 committed by Gerrit Code Review
commit 201090b0bc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/compute/api.py
View File

@ -1214,7 +1214,7 @@ class API(base.Base):
@staticmethod
def _volume_size(instance_type, bdm):
size = bdm.get('volume_size')
# NOTE (ndipanov): inherit flavour size only for swap and ephemeral
# NOTE (ndipanov): inherit flavor size only for swap and ephemeral
if (size is None and bdm.get('source_type') == 'blank' and
bdm.get('destination_type') == 'local'):
if bdm.get('guest_format') == 'swap':

2
nova/virt/hardware.py
View File

@ -166,7 +166,7 @@ def get_number_of_serial_ports(flavor, image_meta):
:param image_meta: nova.objects.ImageMeta object instance
If flavor extra specs is not set, then any image meta value is permitted.
If flavour extra specs *is* set, then this provides the default serial
If flavor extra specs *is* set, then this provides the default serial
port count. The image meta is permitted to override the extra specs, but
*only* with a lower value. ie