diff options
| author | Brian Elliott <bdelliott@gmail.com> | 2013-06-05 03:29:58 +0000 |
|---|---|---|
| committer | Brian Elliott <bdelliott@gmail.com> | 2013-06-26 15:02:28 +0000 |
| commit | eb52c017a182892e6a62ce5b2ddc30f027311341 (patch) | |
| tree | 47847ff34a05d062612536f809d526ba5fd2d493 /plugins | |
| parent | 1fcebf22a6541d0179251d850a98f657ca4482be (diff) | |
xenapi: Make BitTorrent url more flexible
Change xenapi bittorrent plugin to not assume that torrent file
is under CONF.xenapi_torrent_base_url + image_id + ".torrent".
This allows for sources images from arbitrary torrent URLs.
Change-Id: Ica9462a51c6299b5affc861781f3054d18866458
Diffstat (limited to 'plugins')
| -rwxr-xr-x | plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent b/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent index 8ae93698d..70c62ec23 100755 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent @@ -49,12 +49,11 @@ def _make_torrent_cache(): return torrent_cache_path -def _fetch_torrent_file(torrent_cache_path, image_id, torrent_base_url): +def _fetch_torrent_file(torrent_cache_path, image_id, torrent_url): torrent_path = os.path.join( torrent_cache_path, image_id + '.torrent') if not os.path.exists(torrent_path): - torrent_url = torrent_base_url + "/%s.torrent" % image_id logging.info("Downloading %s" % torrent_url) # Write contents to temporary path to ensure we don't have partially @@ -250,7 +249,7 @@ def _make_seed_cache(): return seed_cache_path -def download_vhd(session, image_id, torrent_base_url, torrent_seed_duration, +def download_vhd(session, image_id, torrent_url, torrent_seed_duration, torrent_seed_chance, torrent_max_last_accessed, torrent_listen_port_start, torrent_listen_port_end, torrent_download_stall_cutoff, uuid_stack, sr_path, @@ -266,7 +265,7 @@ def download_vhd(session, image_id, torrent_base_url, torrent_seed_duration, _reap_old_torrent_files(torrent_cache_path, torrent_max_last_accessed) torrent_path = _fetch_torrent_file( - torrent_cache_path, image_id, torrent_base_url) + torrent_cache_path, image_id, torrent_url) staging_path = utils.make_staging_area(sr_path) try: |