summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2011-06-06 11:41:04 -0400
committerAlex Meade <alex.meade@rackspace.com>2011-06-06 11:41:04 -0400
commit5c8b2707b11a3b4a0a2dedfdbf2792c846ce53c0 (patch)
treebff91a0af440f5b593e94c6325793987c2ad5a58 /plugins
parent3d481e551ac81a35cafcd79c2b17d2bd9c8a050f (diff)
parent54731d1b357ae7527f91b01d17664528aa48c61b (diff)
downloadnova-5c8b2707b11a3b4a0a2dedfdbf2792c846ce53c0.tar.gz
nova-5c8b2707b11a3b4a0a2dedfdbf2792c846ce53c0.tar.xz
nova-5c8b2707b11a3b4a0a2dedfdbf2792c846ce53c0.zip
merge trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/xenserver/xenapi/etc/xapi.d/plugins/glance2
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: