Merge "Fix spelling typos"

5 files changed, 7 insertions, 7 deletions

diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py
index 3a71a6a87..7522ec6bf 100644
--- a/nova/scheduler/driver.py
+++ b/nova/scheduler/driver.py
@@ -296,7 +296,7 @@ class Scheduler(object):
     def _live_migration_common_check(self, context, instance_ref, dest):
         """Live migration common check routine.
 
-        Below checkings are followed by
+        The following checks are based on
         http://wiki.libvirt.org/page/TodoPreMigrationChecks
 
         :param context: security context
@@ -313,7 +313,7 @@ class Scheduler(object):
         if orig_hypervisor != dest_hypervisor:
             raise exception.InvalidHypervisorType()
 
-        # Checkng hypervisor version.
+        # Checking hypervisor version.
         orig_hypervisor = oservice_ref['hypervisor_version']
         dest_hypervisor = dservice_ref['hypervisor_version']
         if orig_hypervisor > dest_hypervisor:
@@ -334,7 +334,7 @@ class Scheduler(object):
 
         # Getting total used memory and disk of host
         # It should be sum of memories that are assigned as max value,
-        # because overcommiting is risky.
+        # because overcommitting is risky.
         instance_refs = db.instance_get_all_by_host(context, dest)
         used = sum([i['memory_mb'] for i in instance_refs])
 
diff --git a/nova/scheduler/filter_scheduler.py b/nova/scheduler/filter_scheduler.py
index ccfbd495e..9eea8dea6 100644
--- a/nova/scheduler/filter_scheduler.py
+++ b/nova/scheduler/filter_scheduler.py
@@ -217,7 +217,7 @@ class FilterScheduler(driver.Scheduler):
             return inst
 
     def _add_retry_host(self, filter_properties, host):
-        """Add a retry entry for the selected computep host.  In the event that
+        """Add a retry entry for the selected compute host.  In the event that
         the request gets re-scheduled, this entry will signal that the given
         host has already been tried.
         """
diff --git a/nova/scheduler/filters/all_hosts_filter.py b/nova/scheduler/filters/all_hosts_filter.py
index e3d18dda8..4e01a624e 100644
--- a/nova/scheduler/filters/all_hosts_filter.py
+++ b/nova/scheduler/filters/all_hosts_filter.py
@@ -18,7 +18,7 @@ from nova.scheduler import filters
 
 
 class AllHostsFilter(filters.BaseHostFilter):
-    """NOP host filter. Returns all hosts."""
+    """NOOP host filter. Returns all hosts."""
 
     def host_passes(self, host_state, filter_properties):
         return True
diff --git a/nova/scheduler/host_manager.py b/nova/scheduler/host_manager.py
index 0403dffdf..fb683d91f 100644
--- a/nova/scheduler/host_manager.py
+++ b/nova/scheduler/host_manager.py
@@ -174,7 +174,7 @@ class HostState(object):
 class HostManager(object):
     """Base HostManager class."""
 
-    # Can be overriden in a subclass
+    # Can be overridden in a subclass
     host_state_cls = HostState
 
     def __init__(self):
diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py
index 2bc013704..e1030121a 100644
--- a/nova/scheduler/manager.py
+++ b/nova/scheduler/manager.py
@@ -128,7 +128,7 @@ class SchedulerManager(manager.Manager):
                     reservations)
             return result
         except exception.NoValidHost as ex:
-            # don't reraise
+            # don't re-raise
             self._set_vm_state_and_notify('run_instance',
                                          {'vm_state': vm_states.ERROR},
                                           context, ex, request_spec)