summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorSalvatore Orlando <salvatore.orlando@eu.citrix.com>2011-03-24 10:57:52 +0000
committerSalvatore Orlando <salvatore.orlando@eu.citrix.com>2011-03-24 10:57:52 +0000
commit8c2561b427368e2f5cd11024206502d8d6fd97db (patch)
tree5589cf52f23998df0764466af90bba8e600a983b /plugins
parent2e8902cc1285523f693c39d74a3d05f69e105172 (diff)
parent2434138bbc73a8dbaee44c66cb7bed9f1fa40b2b (diff)
downloadnova-8c2561b427368e2f5cd11024206502d8d6fd97db.tar.gz
nova-8c2561b427368e2f5cd11024206502d8d6fd97db.tar.xz
nova-8c2561b427368e2f5cd11024206502d8d6fd97db.zip
merge trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/xenserver/xenapi/etc/xapi.d/plugins/migration3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
index 4aa89863a..75c653408 100644
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
@@ -22,6 +22,7 @@ XenAPI Plugin for transfering data between host nodes
import os
import os.path
import pickle
+import shlex
import shutil
import subprocess
@@ -97,7 +98,7 @@ def transfer_vhd(session, args):
logging.debug("Preparing to transmit %s to %s" % (source_path,
dest_path))
- ssh_cmd = 'ssh -o StrictHostKeyChecking=no'
+ ssh_cmd = '\"ssh -o StrictHostKeyChecking=no\"'
rsync_args = shlex.split('nohup /usr/bin/rsync -av --progress -e %s %s %s'
% (ssh_cmd, source_path, dest_path))