openstack
/
keystone
Code Issues Proposed changes

Fallback to list_limit from default config 

If list_limit is not provided in domain-specific driver, it should be
used from the default config. It doesn't work out of the box with
domain-specific conf and requires manual handling.

Partial-Bug: 1495669
Change-Id: Ib2251e61d30288eb0baca61861d17f6ac428b242
This commit is contained in:
Boris Bobrov 2016-02-16 19:33:16 +03:00
parent 06421ebd87
commit d7a9018522
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keystone/identity/core.py
View File

@ -1173,7 +1173,10 @@ class IdentityDriverV8(object):
def _get_list_limit(self):
conf = self._get_conf()
return conf.identity.list_limit or conf.list_limit
# use list_limit from domain-specific config. If list_limit in
# domain-specific config is not set, look it up in the default config
return (conf.identity.list_limit or conf.list_limit or
CONF.identity.list_limit or CONF.list_limit)
def is_domain_aware(self):
"""Indicates if Driver supports domains."""