summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/api.py2
-rw-r--r--nova/compute/manager.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index ebf67729d..39b43594a 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -102,7 +102,7 @@ def check_instance_lock(function):
if instance['locked'] and not context.is_admin:
raise exception.InstanceIsLocked(instance_uuid=instance['uuid'])
# NOTE(danms): at this point, we have verified that either
- # theinstance is not locked, or the user is suffiently endowed
+ # the instance is not locked, or the user is sufficiently endowed
# that it doesn't matter. While the following statement may be
# interpreted as the "the instance is not locked", it actually
# refers to the whole condition.
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 39107350d..6d499f9fb 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -2172,7 +2172,7 @@ class ComputeManager(manager.SchedulerDependentManager):
pass
def get_instance_disk_info(self, context, instance_name):
- """Getting infomation of instance's current disk.
+ """Getting information of instance's current disk.
DEPRECATED: This method is no longer used by any current code, but it
is left here to provide backwards compatibility in the rpcapi.
@@ -2446,7 +2446,7 @@ class ComputeManager(manager.SchedulerDependentManager):
"""
if not instance:
instance = self.db.instance_get(context, instance_id)
- LOG.info(_('Post operation of migraton started'),
+ LOG.info(_('Post operation of migration started'),
instance=instance)
# NOTE(tr3buchet): setup networks on destination host
@@ -2840,7 +2840,7 @@ class ComputeManager(manager.SchedulerDependentManager):
# to allow all the hooks and checks to be performed.
self.compute_api.stop(context, db_instance)
except Exception:
- # Note(maoy): there is no need to propergate the error
+ # Note(maoy): there is no need to propagate the error
# because the same power_state will be retrieved next
# time and retried.
# For example, there might be another task scheduled.