summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-07-13 20:05:31 +0000
committerGerrit Code Review <review@openstack.org>2012-07-13 20:05:31 +0000
commite4ac606dd532ccc35a9df82bdc573ded5733eefa (patch)
tree39180dbce1120c7f77254b733df6e5a3d48c0630 /plugins
parent257d654ccad0b3df6d35733603fa5b127c4c0241 (diff)
parentd906692f78e6919cf53df18f00995546cab2b1b0 (diff)
downloadnova-e4ac606dd532ccc35a9df82bdc573ded5733eefa.tar.gz
Merge "Use explicit destination user in xenapi rsync call"
Diffstat (limited to 'plugins')
-rwxr-xr-xplugins/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 48436f5f3b..42f8eaef8c 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))