diff options
| author | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-06-14 15:44:51 +0100 |
|---|---|---|
| committer | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-06-14 15:44:51 +0100 |
| commit | 1f717118f364d06eb9c1fc88548eb3bbc9f7b8eb (patch) | |
| tree | ee338334f2b702eee6829d3c804d93e0df88f4d3 /plugins | |
| parent | 481c7be1834527053ffea4297230475518f6f8d7 (diff) | |
| parent | 91e34d37d2907295e892e96ca2c3039c7fbe14bf (diff) | |
| download | nova-1f717118f364d06eb9c1fc88548eb3bbc9f7b8eb.tar.gz nova-1f717118f364d06eb9c1fc88548eb3bbc9f7b8eb.tar.xz nova-1f717118f364d06eb9c1fc88548eb3bbc9f7b8eb.zip | |
Merge trunk
Adapting code for removing dangling vdis and kernel/ramdisk files to latest changes
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 5c8bc9c1c..fbe080b22 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: |