summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorCerberus <matt.dietz@rackspace.com>2011-02-15 14:29:31 -0600
committerCerberus <matt.dietz@rackspace.com>2011-02-15 14:29:31 -0600
commit00f2905a5debc5835b742dab8dce003f53e33fc2 (patch)
treed2b093eee37208b72b2c999dd1c26f5ff3d61c2d /plugins
parentc97d408842a4a5a8e9d379acc13c9c1f5871827f (diff)
downloadnova-00f2905a5debc5835b742dab8dce003f53e33fc2.tar.gz
nova-00f2905a5debc5835b742dab8dce003f53e33fc2.tar.xz
nova-00f2905a5debc5835b742dab8dce003f53e33fc2.zip
plugin lol
Diffstat (limited to 'plugins')
-rw-r--r--plugins/xenserver/xenapi/etc/xapi.d/plugins/migration8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
index 4a4ed0e73..bfc2a2ed4 100644
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
@@ -89,7 +89,7 @@ def move_vhds_into_sr(session, args):
new_base_copy_path = "%s/%s.vhd" % (temp_vhd_path, new_base_copy_uuid)
new_cow_path = "%s/%s.vhd" % (temp_vhd_path, new_cow_uuid)
- logging.debug('Creating temporary SR path' % temp_vhd_path)
+ logging.debug('Creating temporary SR path %s' % temp_vhd_path)
os.mkdir(temp_vhd_path)
logging.debug('Moving %s into %s' % (source_base_copy_path, temp_vhd_path))
@@ -129,10 +129,10 @@ def transfer_vhd(session, args):
logging.debug("Preparing to transmit %s to %s" % (source_path,
dest_path))
- ssh_cmd = '-e \'ssh -o StrictHostKeyChecking=no\' '
+ ssh_cmd = 'ssh -o StrictHostKeyChecking=no'
- rsync_args = ['nohup > /root/instance%d_progress' % instance_id, RSYNC,
- '-av', '--progress', ssh_cmd, source_path, dest_path]
+ rsync_args = ['nohup', RSYNC, '-av', '--progress', '-e', ssh_cmd,
+ source_path, dest_path]
logging.debug('rsync %s' % (' '.join(rsync_args, )))