diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-05-25 08:42:58 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-05-25 08:42:58 -0700 |
| commit | 9d842298d9e771b7b25ecd94c3e2437c65d00beb (patch) | |
| tree | 1a883e9caa68200ba8b9c013775c9fb222853dec /plugins | |
| parent | f4cc59f0d4344deecea59a7276a50d446f1ea2cd (diff) | |
| parent | 30b6d5e2722d1c92115f668b405dc7eed9cc27b2 (diff) | |
| download | nova-9d842298d9e771b7b25ecd94c3e2437c65d00beb.tar.gz nova-9d842298d9e771b7b25ecd94c3e2437c65d00beb.tar.xz nova-9d842298d9e771b7b25ecd94c3e2437c65d00beb.zip | |
merge against 2a
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) |