From 41e4e18a0324593c0076c3936d63bb6dcca487cb Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Mon, 14 Feb 2011 23:12:34 +0000
Subject: First cut on XenServer unified-images

---
 nova/api/openstack/servers.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 17c5519a1..1c9dcd9a6 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -140,7 +140,11 @@ class Controller(wsgi.Controller):
 
         image_id = str(image_id)
         image = self._image_service.show(req.environ['nova.context'], image_id)
-        return lookup('kernel_id'), lookup('ramdisk_id')
+        disk_format = image['properties'].get('disk_format', None)
+        if disk_format == "vhd":
+            return None, None
+        else:
+            return lookup('kernel_id'), lookup('ramdisk_id')
 
     def create(self, req):
         """ Creates a new server for a given user """
-- 
cgit