diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-13 15:21:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-13 15:21:11 +0000 |
| commit | 78e54998b608cd79471ec5aa6207d43e0331ad82 (patch) | |
| tree | 5b7c259bd80c865567f3c770d6f7c21a5ebca152 /nova/api | |
| parent | 3c36a7b0acaec551ad48e7961c927947782f0dc0 (diff) | |
| parent | 79d516fed18a9e265044bee1e89c3e47617b8a70 (diff) | |
Merge "Move osapi_max_limit into api.openstack.common"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/common.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py index a9ffebaa8..4645659bf 100644 --- a/nova/api/openstack/common.py +++ b/nova/api/openstack/common.py @@ -34,6 +34,10 @@ from nova.openstack.common import log as logging from nova import quota osapi_opts = [ + cfg.IntOpt('osapi_max_limit', + default=1000, + help='the maximum number of items returned in a single ' + 'response from a collection resource'), cfg.StrOpt('osapi_compute_link_prefix', default=None, help='Base URL that will be presented to users in links ' @@ -45,7 +49,6 @@ osapi_opts = [ ] CONF = cfg.CONF CONF.register_opts(osapi_opts) -CONF.import_opt('osapi_max_limit', 'nova.config') LOG = logging.getLogger(__name__) QUOTAS = quota.QUOTAS |