Check parameter 'marker' before make request to glance

fix bug: 1065053 Since glance need parameter 'marker' to be a image-id, can not be None. check 'marker' before make request to glance. Change-Id: I7fc063ea74ae3be71e2effdc0b62432ebdd52c27
openstack · Oct 16, 2012 · d23cf20 · d23cf20
1 parent cde48d4
commit d23cf20
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
@@ -1204,8 +1204,13 @@ def fetch_images():
             images = []
             marker = None
             while True:
-                batch = image_service.detail(context, filters=filters,
-                        marker=marker, sort_key='created_at', sort_dir='desc')
+                if marker is not None:
+                    batch = image_service.detail(context, filters=filters,
+                            marker=marker, sort_key='created_at',
+                            sort_dir='desc')
+                else:
+                    batch = image_service.detail(context, filters=filters,
+                            sort_key='created_at', sort_dir='desc')
                 if not batch:
                     break
                 images += batch