summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorDan Prince <dan.prince@rackspace.com>2011-06-14 22:21:14 +0000
committerTarmac <>2011-06-14 22:21:14 +0000
commitb22a12b8e265f2ce2cb5496086b1d283f57e9f8f (patch)
treee039495dc77fab581051618caaa2dd8282674440 /plugins
parent046656b511a8ea881dcb8df6de6c51caf35486bd (diff)
parent73303a34652c738064821ede0258a799435c63d1 (diff)
downloadnova-b22a12b8e265f2ce2cb5496086b1d283f57e9f8f.tar.gz
nova-b22a12b8e265f2ce2cb5496086b1d283f57e9f8f.tar.xz
nova-b22a12b8e265f2ce2cb5496086b1d283f57e9f8f.zip
Updated so that we use a 'tmp' subdirectory under the Xen SR when staging migrations. Fixes an issue where you would get a 'File exists' error because the directory under 'images' already existed (created via the rsync copy).
Diffstat (limited to 'plugins')
-rw-r--r--plugins/xenserver/xenapi/etc/xapi.d/plugins/migration2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
index 75c653408..ac1c50ad9 100644
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
@@ -44,7 +44,7 @@ def move_vhds_into_sr(session, args):
new_cow_uuid = params['new_cow_uuid']
sr_path = params['sr_path']
- sr_temp_path = "%s/images/" % sr_path
+ sr_temp_path = "%s/tmp/" % sr_path
# Discover the copied VHDs locally, and then set up paths to copy
# them to under the SR