Merge "Correct some misspell words in nova"

nova/api/openstack/compute/servers.py

@@ -587,7 +587,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
         try:

nova/compute/manager.py

@@ -1206,7 +1206,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)
@@ -2591,7 +2591,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

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

nova/db/sqlalchemy/api.py

@@ -3812,7 +3812,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.

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__ = (