diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-12-12 07:33:49 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-12-12 08:27:03 +0000 |
| commit | 79d516fed18a9e265044bee1e89c3e47617b8a70 (patch) | |
| tree | 65cedd3d28f43287783f57fdf830147d28d4919f | |
| parent | f256ba35ef9a379ed29cb253bc5cd338595b53f0 (diff) | |
| download | nova-79d516fed18a9e265044bee1e89c3e47617b8a70.tar.gz nova-79d516fed18a9e265044bee1e89c3e47617b8a70.tar.xz nova-79d516fed18a9e265044bee1e89c3e47617b8a70.zip | |
Move osapi_max_limit into api.openstack.common
blueprint: scope-config-opts
Change-Id: I15e4f58be07ad4aff09ff30c021b1d86a6f15d53
| -rw-r--r-- | nova/api/openstack/common.py | 5 | ||||
| -rw-r--r-- | nova/config.py | 4 |
2 files changed, 4 insertions, 5 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 diff --git a/nova/config.py b/nova/config.py index 45d46f779..937df3b5f 100644 --- a/nova/config.py +++ b/nova/config.py @@ -127,10 +127,6 @@ global_opts = [ cfg.StrOpt('osapi_path', default='/v1.1/', help='the path prefix used to call the openstack api server'), - cfg.IntOpt('osapi_max_limit', - default=1000, - help='the maximum number of items returned in a single ' - 'response from a collection resource'), cfg.StrOpt('metadata_host', default='$my_ip', help='the ip for the metadata api server'), |