diff --git a/nova/compute/api.py b/nova/compute/api.py index 743630d75527..2fbfd61c7380 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -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': diff --git a/nova/virt/hardware.py b/nova/virt/hardware.py index 092d030c5559..0b87b795ac26 100644 --- a/nova/virt/hardware.py +++ b/nova/virt/hardware.py @@ -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