diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-23 05:00:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-23 05:00:40 +0000 |
| commit | 25df424d70c1ba53627f756190636a960ed25bd3 (patch) | |
| tree | f796706825d9cb5e80cd2c2a2a7301c04c222680 | |
| parent | 6ea4de1e27fc1fe4b980acc7cfdbcf621ed45afb (diff) | |
| parent | d23cf2096fe62c1e575e79c4ff0af3f1fb7830ad (diff) | |
Merge "Check parameter 'marker' before make request to glance"
| -rw-r--r-- | nova/compute/manager.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 942b66563..f598ccb39 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1239,8 +1239,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 |