diff options
| author | Cory Wright <cory.wright@rackspace.com> | 2011-05-23 11:39:39 -0400 |
|---|---|---|
| committer | Cory Wright <cory.wright@rackspace.com> | 2011-05-23 11:39:39 -0400 |
| commit | 57acd948d8d1584262f9e7fc1845be57ab8f2ffd (patch) | |
| tree | c1c46dcf05f871bf40f04da6bf9369ecd1ed9dd7 /plugins | |
| parent | 67a9b67788a6abc73dc61d99e401918d83314c82 (diff) | |
| parent | e1795bd73c71a20290bc988c410e0cc30afe6bd8 (diff) | |
| download | nova-57acd948d8d1584262f9e7fc1845be57ab8f2ffd.tar.gz nova-57acd948d8d1584262f9e7fc1845be57ab8f2ffd.tar.xz nova-57acd948d8d1584262f9e7fc1845be57ab8f2ffd.zip | |
merge trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/xenserver/xenapi/etc/xapi.d/plugins/glance | 4 |
1 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 0a45f3873..4b45671ae 100644 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance @@ -68,12 +68,12 @@ def _download_tarball(sr_path, staging_path, image_id, glance_host, area. """ conn = httplib.HTTPConnection(glance_host, glance_port) - conn.request('GET', '/images/%s' % image_id) + conn.request('GET', '/v1/images/%s' % image_id) resp = conn.getresponse() if resp.status == httplib.NOT_FOUND: raise Exception("Image '%s' not found in Glance" % image_id) elif resp.status != httplib.OK: - raise Exception("Unexpected response from Glance %i" % res.status) + raise Exception("Unexpected response from Glance %i" % resp.status) tar_cmd = "tar -zx --directory=%(staging_path)s" % locals() tar_proc = _make_subprocess(tar_cmd, stderr=True, stdin=True) |