diff options
| author | Lorin Hochstein <lorin@isi.edu> | 2011-06-16 16:48:20 -0400 |
|---|---|---|
| committer | Lorin Hochstein <lorin@isi.edu> | 2011-06-16 16:48:20 -0400 |
| commit | a51b2ed4ed4840262bd07d5dfc11e33a32e1accd (patch) | |
| tree | 1364ed7aac86f805ddba903efa0b43afc6e61112 /plugins | |
| parent | d68f6de8d8275ec6dd9f231b9b52971f2ad15263 (diff) | |
| parent | 1763419a3f6b01bb0ef98c700f0f350e756b359c (diff) | |
| download | nova-a51b2ed4ed4840262bd07d5dfc11e33a32e1accd.tar.gz nova-a51b2ed4ed4840262bd07d5dfc11e33a32e1accd.tar.xz nova-a51b2ed4ed4840262bd07d5dfc11e33a32e1accd.zip | |
Upstream merge
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/xenserver/xenapi/etc/xapi.d/plugins/glance | 2 | ||||
| -rw-r--r-- | plugins/xenserver/xenapi/etc/xapi.d/plugins/migration | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance index 0c00d168b..46031ebe8 100644 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance @@ -244,7 +244,7 @@ def _upload_tarball(staging_path, image_id, glance_host, glance_port, os_type): conn = httplib.HTTPConnection(glance_host, glance_port) # NOTE(sirp): httplib under python2.4 won't accept a file-like object # to request - conn.putrequest('PUT', '/images/%s' % image_id) + conn.putrequest('PUT', '/v1/images/%s' % image_id) # NOTE(sirp): There is some confusion around OVF. Here's a summary of # where we currently stand: 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 |