summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorCerberus <matt.dietz@rackspace.com>2011-02-15 15:27:23 -0600
committerCerberus <matt.dietz@rackspace.com>2011-02-15 15:27:23 -0600
commit9f77e0a46cac2ebaf9a18c4a175099b208db1adb (patch)
treea7154e93d1d72f0e73fb84606d1a8b69b4272abb /plugins
parent00f2905a5debc5835b742dab8dce003f53e33fc2 (diff)
downloadnova-9f77e0a46cac2ebaf9a18c4a175099b208db1adb.tar.gz
nova-9f77e0a46cac2ebaf9a18c4a175099b208db1adb.tar.xz
nova-9f77e0a46cac2ebaf9a18c4a175099b208db1adb.zip
More plugin lol
Diffstat (limited to 'plugins')
-rw-r--r--plugins/xenserver/xenapi/etc/xapi.d/plugins/migration9
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
index bfc2a2ed4..cc72b5d26 100644
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
@@ -90,7 +90,7 @@ def move_vhds_into_sr(session, args):
new_cow_path = "%s/%s.vhd" % (temp_vhd_path, new_cow_uuid)
logging.debug('Creating temporary SR path %s' % temp_vhd_path)
- os.mkdir(temp_vhd_path)
+ os.makedirs(temp_vhd_path)
logging.debug('Moving %s into %s' % (source_base_copy_path, temp_vhd_path))
shutil.move(source_base_copy_path, new_base_copy_path)
@@ -107,11 +107,12 @@ def move_vhds_into_sr(session, args):
new_base_copy_path])
logging.debug('Moving VHDs into SR %s' % sr_path)
- shutil.move("%s/*.vhd" % temp_vhd_path, sr_path)
+ shutil.move("%s/%s.vhd" % (temp_vhd_path, new_base_copy_uuid), sr_path)
+ shutil.move("%s/%s.vhd" % (temp_vhd_path, new_cow_uuid), sr_path)
- loggin.debug('Cleaning up temporary SR path %s' % temp_vhd_path)
+ logginig.debug('Cleaning up temporary SR path %s' % temp_vhd_path)
os.rmdir(temp_vhd_path)
- return None
+ return ""
def transfer_vhd(session, args):