summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-06-17 13:12:13 -0400
committerBrian Waldon <brian.waldon@rackspace.com>2011-06-17 13:12:13 -0400
commitcbaf1a68c606bc77ac7a9d1ab082ce3e317fcf47 (patch)
treea51673054f2d7a0d4d802fba508b159ec276752b /plugins
parent7c68bb817224bb608e2d0c92e1b00384ca7284df (diff)
parent9152140e761786f7ac19ceac822a1d091684bc42 (diff)
downloadnova-cbaf1a68c606bc77ac7a9d1ab082ce3e317fcf47.tar.gz
nova-cbaf1a68c606bc77ac7a9d1ab082ce3e317fcf47.tar.xz
nova-cbaf1a68c606bc77ac7a9d1ab082ce3e317fcf47.zip
merging trunk
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