diff options
| author | William Wolf <throughnothing@gmail.com> | 2011-06-06 09:38:31 -0400 |
|---|---|---|
| committer | William Wolf <throughnothing@gmail.com> | 2011-06-06 09:38:31 -0400 |
| commit | 78611b6a002095747ea41e26029cdea5aeb753f7 (patch) | |
| tree | e6184facb59b4a11685abb63ba24deca7dc354b8 /plugins | |
| parent | 4846ade9909f5c3af8849fa9112ad36b4d18b391 (diff) | |
| parent | 54731d1b357ae7527f91b01d17664528aa48c61b (diff) | |
| download | nova-78611b6a002095747ea41e26029cdea5aeb753f7.tar.gz nova-78611b6a002095747ea41e26029cdea5aeb753f7.tar.xz nova-78611b6a002095747ea41e26029cdea5aeb753f7.zip | |
merge with trunk
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: |