summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmando Migliaccio <armando.migliaccio@citrix.com>2011-03-29 11:20:16 +0100
committerArmando Migliaccio <armando.migliaccio@citrix.com>2011-03-29 11:20:16 +0100
commit73f05da6400fe7f4324cf98c7d0706fb68a62870 (patch)
tree426a07f77a238d4616082f07dae985d04ca5a2a7
parentffc6c27520a613ce0436e1a30d19f2d868fb88a3 (diff)
downloadnova-73f05da6400fe7f4324cf98c7d0706fb68a62870.tar.gz
nova-73f05da6400fe7f4324cf98c7d0706fb68a62870.tar.xz
nova-73f05da6400fe7f4324cf98c7d0706fb68a62870.zip
sorted pep8 errors that were introduced during previous fixes
-rw-r--r--nova/virt/xenapi/vmops.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index a9514bd61..c96c35a6e 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -430,7 +430,7 @@ class VMOps(object):
"""Set the root/admin password on the VM instance.
This is done via an agent running on the VM. Communication between nova
- and the agent is done via writing xenstore records. Since communication
+ and the agent is done via writing xenstore records. Since communication
is done over the XenAPI RPC calls, we need to encrypt the password.
We're using a simple Diffie-Hellman class instead of the more advanced
one in M2Crypto for compatibility with the agent code.
@@ -467,12 +467,12 @@ class VMOps(object):
return resp_dict['message']
def inject_file(self, instance, path, contents):
- """Write a file to the VM instance.
+ """Write a file to the VM instance.
The path to which it is to be written and the contents of the file
need to be supplied; both will be base64-encoded to prevent errors
with non-ASCII characters being transmitted. If the agent does not
- support file injection, or the user has disabled it, a
+ support file injection, or the user has disabled it, a
NotImplementedError will be raised.
"""