commit 84ed9d6eef7ab7a3a5a9fb646a3e6c622a0b27c4
author Sapan Bhatia <gwsapan@gmail.com> Mon Mar 16 12:55:23 2015 -0400
committer Sapan Bhatia <gwsapan@gmail.com> Mon Mar 16 12:55:23 2015 -0400
tree 0aec72c47f9c84ed738797f6bc77e35a3c181f51
parent ca4939bf3f48a4172b5771de00bc394a01a1f9d7

Fix implemented in a debugging session with Marc Fiuczynski

xos/openstack_observer/steps/sync_slivers.py

diff --git a/xos/openstack_observer/steps/sync_slivers.py b/xos/openstack_observer/steps/sync_slivers.py
index 9cb0c89..ea6addd 100644
--- a/xos/openstack_observer/steps/sync_slivers.py
+++ b/xos/openstack_observer/steps/sync_slivers.py
@@ -73,12 +73,15 @@
                     nics.append(net['id'])
 
         # look up image id
-        controller_driver = self.driver.admin_driver(controller=sliver.node.site_deployment.controller)
-        image_id = None
-        images = controller_driver.shell.glanceclient.images.list()
-        for image in images:
-            if image.name == sliver.image.name or not image_id:
-                image_id = image.id
+        if (not sliver.image.id):
+            controller_driver = self.driver.admin_driver(controller=sliver.node.site_deployment.controller)
+            image_id = None
+            images = controller_driver.shell.glanceclient.images.list()
+            for image in images:
+                if image.name == sliver.image.name or not image_id:
+                    image_id = image.id
+        else:
+            image_id = sliver.image.id
 
         # look up key name at the controller
         # create/fetch keypair