summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes.erdfelt@rackspace.com>2011-06-15 14:33:52 +0000
committerJohannes Erdfelt <johannes.erdfelt@rackspace.com>2011-06-15 14:33:52 +0000
commitedcb7399e3d3ec9fb52e836ea0fd46c40aacfa25 (patch)
tree844b5e71515db045cefd45fa1f746b1c71b00379 /plugins
parent61f539dfd3f1f13a775ec837da5646ef16c270d7 (diff)
parent57932d53e7cc5389b7d53fd8875a684f70e2eb67 (diff)
downloadnova-edcb7399e3d3ec9fb52e836ea0fd46c40aacfa25.tar.gz
nova-edcb7399e3d3ec9fb52e836ea0fd46c40aacfa25.tar.xz
nova-edcb7399e3d3ec9fb52e836ea0fd46c40aacfa25.zip
Merge with 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