diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-06-08 13:27:00 -0500 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-06-08 13:27:00 -0500 |
| commit | a538fceb8cf6d692db0e3585b99ed10a17197960 (patch) | |
| tree | 963ec4e5000c2b07088f78e7e746cff20a20179f /plugins | |
| parent | 0438855659d89133e588dd4201956a901ed85787 (diff) | |
| parent | 405945ad4801a9e434bcf9292bc01db354a9f2a7 (diff) | |
| download | nova-a538fceb8cf6d692db0e3585b99ed10a17197960.tar.gz nova-a538fceb8cf6d692db0e3585b99ed10a17197960.tar.xz nova-a538fceb8cf6d692db0e3585b99ed10a17197960.zip | |
merged trunk again
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/xenserver/xenapi/etc/xapi.d/plugins/glance | 2 |
1 files changed, 1 insertions, 1 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: |