diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 7b6a58316a51..11de0882895a 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -577,7 +577,7 @@ class ServersController(wsgi.Controller): 'availability_zone': availability_zone} authorize(context, target, 'create') - # TODO(Shao He, Feng) move this policy check to os-availabilty-zone + # TODO(Shao He, Feng) move this policy check to os-availability-zone # extension after refactor it. parse_az = self.compute_api.parse_availability_zone availability_zone, host, node = parse_az(context, availability_zone) diff --git a/nova/compute/manager.py b/nova/compute/manager.py index a78d0fe7d9c6..3750767062b3 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1205,7 +1205,7 @@ class ComputeManager(manager.Manager): Passes straight through to the virtualization driver. - Synchronise the call because we may still be in the middle of + Synchronize the call because we may still be in the middle of creating the instance. """ @utils.synchronized(instance.uuid) @@ -2589,7 +2589,7 @@ class ComputeManager(manager.Manager): :param preserve_ephemeral: True if the default ephemeral storage partition must be preserved on rebuild :param migration: a Migration object if one was created for this - rebuild operation (if it's a part of evacaute) + rebuild operation (if it's a part of evacuate) :param scheduled_node: A node of the host chosen by the scheduler. If a host was specified by the user, this will be None diff --git a/nova/conductor/rpcapi.py b/nova/conductor/rpcapi.py index 48d64df07f65..75c4dde3e429 100644 --- a/nova/conductor/rpcapi.py +++ b/nova/conductor/rpcapi.py @@ -256,7 +256,7 @@ class ComputeTaskAPI(object): 1.2 - Added build_instances 1.3 - Added unshelve_instance 1.4 - Added reservations to migrate_server. - 1.5 - Added the leagacy_bdm parameter to build_instances + 1.5 - Added the legacy_bdm parameter to build_instances 1.6 - Made migrate_server use instance objects 1.7 - Do not send block_device_mapping and legacy_bdm to build_instances 1.8 - Add rebuild_instance diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 2936cd2d3ebd..2a54f259dfe8 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -4049,7 +4049,7 @@ def quota_reserve(context, resources, project_quotas, user_quotas, deltas, usages = project_usages else: # NOTE(mriedem): user_usages is a dict of resource keys to - # QuotaUsage sqlalchemy dict-like objects and doen't log well + # QuotaUsage sqlalchemy dict-like objects and doesn't log well # so convert the user_usages values to something useful for # logging. Remove this if we ever change how # _get_project_user_quota_usages returns the user_usages values. diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index cf8d7b7da662..22fb8d54b6ad 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -1520,7 +1520,7 @@ class Allocation(BASE, models.ModelBase): class ResourceProviderAggregate(BASE, models.ModelBase): - """Assocate a resource provider with an aggregate.""" + """Associate a resource provider with an aggregate.""" __tablename__ = 'resource_provider_aggregates' __table_args__ = (