diff options
| author | Zuul <zuul@review.openstack.org> | 2018-06-06 03:59:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-06-06 03:59:06 +0000 |
| commit | 0cb0ffa32de475059003f7ee973925caf4bb14e8 (patch) | |
| tree | 23633817caa962f8c4740723ca976ca6d995a352 /novaclient/v2/servers.py | |
| parent | 681f1789ff265a6d9ac74d43d6b30c9ab0179891 (diff) | |
| parent | abaa86fd86d4beca0082ff1768d5306e5e86302e (diff) | |
| download | python-novaclient-0cb0ffa32de475059003f7ee973925caf4bb14e8.tar.gz | |
Merge "Revert "Fix listing of instances above API max_limit""10.3.0
Diffstat (limited to 'novaclient/v2/servers.py')
| -rw-r--r-- | novaclient/v2/servers.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/novaclient/v2/servers.py b/novaclient/v2/servers.py index 4e716879..a7b3eda1 100644 --- a/novaclient/v2/servers.py +++ b/novaclient/v2/servers.py @@ -855,10 +855,7 @@ class ServerManager(base.BootingManagerWithFind): result.extend(servers) result.append_request_ids(servers.request_ids) - if limit and limit != -1: - limit = max(limit - len(servers), 0) - - if not servers or limit == 0: + if not servers or limit != -1: break marker = result[-1].id return result |