summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Leafe <ed@leafe.com>2011-08-02 19:02:40 +0000
committerEd Leafe <ed@leafe.com>2011-08-02 19:02:40 +0000
commitf06dee2b82bd658a57736d94974f431976085400 (patch)
treecddf3829354e156ace67849989a4f38d0e53d5db
parent5b11fe047ac9f58c88a771707a7c59ca4f5bd0f9 (diff)
downloadnova-f06dee2b82bd658a57736d94974f431976085400.tar.gz
nova-f06dee2b82bd658a57736d94974f431976085400.tar.xz
nova-f06dee2b82bd658a57736d94974f431976085400.zip
Fixed several typos
-rw-r--r--nova/api/openstack/contrib/hosts.py5
-rw-r--r--nova/compute/manager.py2
-rw-r--r--nova/tests/test_hosts.py2
-rw-r--r--tools/pip-requires1
4 files changed, 5 insertions, 5 deletions
diff --git a/nova/api/openstack/contrib/hosts.py b/nova/api/openstack/contrib/hosts.py
index 94fba910c..2d9d494b9 100644
--- a/nova/api/openstack/contrib/hosts.py
+++ b/nova/api/openstack/contrib/hosts.py
@@ -85,7 +85,7 @@ class HostController(object):
# 'startup' option to start up a host, but this is not
# technically feasible now, as we run the host on the
# XenServer box.
- msg = _("Host startup on XenServer is not supported."))
+ msg = _("Host startup on XenServer is not supported.")
raise webob.exc.HTTPBadRequest(explanation=msg)
elif val in ("reboot", "shutdown"):
return self._set_powerstate(req, id, val)
@@ -106,8 +106,7 @@ class HostController(object):
return {"host": host, "status": result}
def _set_powerstate(self, req, host, state):
- """Reboots or shuts down the host.
- """
+ """Reboots or shuts down the host."""
context = req.environ['nova.context']
result = self.compute_api.set_host_powerstate(context, host=host,
state=state)
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index d0f9a81f4..cd05f3f24 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1,4 +1,4 @@
-: tabstop=4 shiftwidth=4 softtabstop=4
+#: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
diff --git a/nova/tests/test_hosts.py b/nova/tests/test_hosts.py
index ad057f429..9f54d5ec7 100644
--- a/nova/tests/test_hosts.py
+++ b/nova/tests/test_hosts.py
@@ -52,7 +52,7 @@ def stub_set_host_powerstate(context, host, state):
# We'll simulate success and failure by assuming
# that 'host_c1' always succeeds, and 'host_c2'
# always fails
- return state if host == "host_c1" else "running"
+ return state if host == "host_c1" else "running"
class FakeRequest(object):
diff --git a/tools/pip-requires b/tools/pip-requires
index dec93c351..1e8f7e1d2 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -33,3 +33,4 @@ coverage
nosexcover
GitPython
paramiko
+xattr