diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-07-13 16:12:25 +0000 |
|---|---|---|
| committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-07-13 16:52:29 +0000 |
| commit | d906692f78e6919cf53df18f00995546cab2b1b0 (patch) | |
| tree | 89cd446c26403b7dafde5c4d9218bb82c7527ff0 /plugins | |
| parent | e656cc8a92cf340e0b8b7f21d633280aff2d4f55 (diff) | |
| download | nova-d906692f78e6919cf53df18f00995546cab2b1b0.tar.gz nova-d906692f78e6919cf53df18f00995546cab2b1b0.tar.xz nova-d906692f78e6919cf53df18f00995546cab2b1b0.zip | |
Use explicit destination user in xenapi rsync call
Recent versions of xenserver use a newer, but buggy, version of rsync
that will attempt to parse out the username and fail if it isn't in
the destination. So, add it to the destination to ensure this works
with both older and newer versions of rsync.
Change-Id: I9b7f05a8ea5cf5b7fae1a55a2b8557b2bfe5b865
Diffstat (limited to 'plugins')
| -rwxr-xr-x | plugins/xenserver/xenapi/etc/xapi.d/plugins/migration | 3 |
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 48436f5f3..42f8eaef8 100755 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration @@ -105,7 +105,8 @@ def transfer_vhd(session, args): vhd_path = "%s.vhd" % vdi_uuid source_path = "%s/%s" % (sr_path, vhd_path) - dest_path = '%s:/images/instance%s/' % (host, instance_uuid) + dest_user = 'root' + dest_path = '%s@%s:/images/instance%s/' % (dest_user, host, instance_uuid) logging.debug("Preparing to transmit %s to %s" % (source_path, dest_path)) |