summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorThierry Carrez <thierry@openstack.org>2011-01-27 16:39:51 +0100
committerThierry Carrez <thierry@openstack.org>2011-01-27 16:39:51 +0100
commitae0f6c611d0d195da243e4a8f7dfe5fcb79978ac (patch)
tree3e3daf615c1281550ca4628370f0a4507c9ff480 /nova
parent0a6ab4362284d92cddd22ee6bfa4182c64299064 (diff)
Naive, low-regression-risk fix enabling Glance to work with libvirt/hyperv
Diffstat (limited to 'nova')
-rw-r--r--nova/virt/images.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/virt/images.py b/nova/virt/images.py
index 9c987e14d..7a6fef330 100644
--- a/nova/virt/images.py
+++ b/nova/virt/images.py
@@ -111,5 +111,8 @@ def _image_path(path):
def image_url(image):
+ if FLAGS.image_service == "nova.image.glance.GlanceImageService":
+ return "http://%s:%s/images/%s" % (FLAGS.glance_host,
+ FLAGS.glance_port, image)
return "http://%s:%s/_images/%s/image" % (FLAGS.s3_host, FLAGS.s3_port,
image)