summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorDan Prince <dan.prince@rackspace.com>2011-03-24 10:10:54 -0400
committerDan Prince <dan.prince@rackspace.com>2011-03-24 10:10:54 -0400
commit656c1d14ac51ce2af697e00ce72b9580fd3f8c3a (patch)
tree1eb6b0871078ccd4cba171e2f466b0af7a4e76ca /plugins
parentb49ac333df4de61ca632666cca85f6e9baf788b0 (diff)
parentc53e56576ead57815f3542a7faa797e5d0135e0c (diff)
downloadnova-656c1d14ac51ce2af697e00ce72b9580fd3f8c3a.tar.gz
nova-656c1d14ac51ce2af697e00ce72b9580fd3f8c3a.tar.xz
nova-656c1d14ac51ce2af697e00ce72b9580fd3f8c3a.zip
Merge w/ 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))