From d23cf2096fe62c1e575e79c4ff0af3f1fb7830ad Mon Sep 17 00:00:00 2001 From: TianTian Gao Date: Tue, 16 Oct 2012 15:17:31 +0800 Subject: 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 --- nova/compute/manager.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 7cd54bd75..ba857f0d3 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1204,8 +1204,13 @@ class ComputeManager(manager.SchedulerDependentManager): 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 -- cgit