← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to plugins/xenserver/xenapi/etc/xapi.d/plugins/migration

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2013-02-22 09:27:29 UTC
  • mfrom: (1.1.68)
  • Revision ID: package-import@ubuntu.com-20130222092729-nn3gt8rf97uvts77
Tags: 2013.1.g3-0ubuntu1
https://launchpad.net/bugs/1110567
[ Chuck Short ]
* New usptream release. 
* debian/patches/debian/patches/fix-ubuntu-tests.patch: Refreshed.
* debian/nova-baremetal.logrotate: Fix logfile path.
* debian/control, debian/nova-spiceproxy.{install, logrotate, upstart}:
  Add spice html5 proxy support.
* debian/nova-novncproxy.upstart: Start on runlevel [2345]
* debian/rules: Call testr directly since run_tests.sh -N gives weird return
  value when tests pass.
* debian/pyddist-overrides: Add websockify.
* debian/nova-common.postinst: Removed config file conversion, since
  the option is no longer available. (LP: #1110567)
* debian/control: Add python-pyasn1 as a dependency.
* debian/control: Add python-oslo-config as a dependency.
* debian/control: Suggest sysfsutils, sg3-utils, multipath-tools for fibre
  channel support.

[ Adam Gandelman ]
* debian/control: Fix typo (websocikfy -> websockify).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
16
16
#    under the License.
17
17
 
18
18
"""
19
 
XenAPI Plugin for transfering data between host nodes
 
19
XenAPI Plugin for transferring data between host nodes
20
20
"""
21
21
import utils
22
22
 
25
25
 
26
26
 
27
27
def move_vhds_into_sr(session, instance_uuid, sr_path, uuid_stack):
28
 
    """Moves the VHDs from their copied location to the SR"""
 
28
    """Moves the VHDs from their copied location to the SR."""
29
29
    staging_path = "/images/instance%s" % instance_uuid
30
30
    imported_vhds = utils.import_vhds(sr_path, staging_path, uuid_stack)
31
31
    utils.cleanup_staging_area(staging_path)
47
47
 
48
48
 
49
49
def transfer_vhd(session, instance_uuid, host, vdi_uuid, sr_path, seq_num):
50
 
    """Rsyncs a VHD to an adjacent host"""
 
50
    """Rsyncs a VHD to an adjacent host."""
51
51
    staging_path = utils.make_staging_area(sr_path)
52
52
    try:
53
53
        utils.prepare_staging_area(