summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/api.py5
-rw-r--r--nova/compute/manager.py2
2 files changed, 4 insertions, 3 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 899febcd8..a996fa310 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -1470,7 +1470,7 @@ class API(base.Base):
'host': output['host'],
'port': output['port']}})
- # hostignore and portignore are compatability params for noVNC
+ # hostignore and portignore are compatibility params for noVNC
return {'url': '%s/vnc_auto.html?token=%s&host=%s&port=%s' % (
FLAGS.vncproxy_url,
output['token'],
@@ -1542,7 +1542,8 @@ class API(base.Base):
# TODO(tr3buchet): currently network_info doesn't contain floating IPs
# in its info, if this changes, the next few lines will need to
- # accomodate the info containing floating as well as fixed ip addresses
+ # accommodate the info containing floating as well as fixed ip
+ # addresses
fixed_ip_addrs = []
for info in self.network_api.get_instance_nw_info(context,
instance):
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 76a8ab7f6..2bb315d8f 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -138,7 +138,7 @@ class ComputeManager(manager.SchedulerDependentManager):
def __init__(self, compute_driver=None, *args, **kwargs):
"""Load configuration options and connect to the hypervisor."""
# TODO(vish): sync driver creation logic with the rest of the system
- # and redocument the module docstring
+ # and re-document the module docstring
if not compute_driver:
compute_driver = FLAGS.compute_driver