summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorNaveed Massjouni <naveedm9@gmail.com>2011-03-24 01:08:17 -0400
committerNaveed Massjouni <naveedm9@gmail.com>2011-03-24 01:08:17 -0400
commitdcb5ddd117c713d60f06ce335d5484ef0242c02d (patch)
treec0dc215485580eba69d19e2219f13cd9bb8b3f98 /plugins
parent0d677a9b63ed9b4612379494bf8a58af1c090331 (diff)
parent6912b0e1efd6ba3814d3b29beef236bfe4da52ea (diff)
downloadnova-dcb5ddd117c713d60f06ce335d5484ef0242c02d.tar.gz
nova-dcb5ddd117c713d60f06ce335d5484ef0242c02d.tar.xz
nova-dcb5ddd117c713d60f06ce335d5484ef0242c02d.zip
Merge from 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))