openstack
/
puppet-glance
Code Issues Proposed changes

Merge "Add more settings to glance-api" into stable/newton

This commit is contained in:
Jenkins 2017-09-27 18:07:37 +00:00 committed by Gerrit Code Review
parent 3dd595c449 afd7f1357e
commit f302d21bca
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/api.pp
View File

@ -247,6 +247,15 @@
# try_sleep: 10
# Defaults to {}
#
# [*limit_param_default*]
# (optional) Default value for the number of items returned by a request if not
# specified explicitly in the request (integer value)
# Default: $::os_service_default.
#
# [*api_limit_max*]
# (optional) Maximum number of results that could be returned by a request
# Default: $::os_service_default.
#
# === deprecated parameters:
#
# [*known_stores*]
@ -368,6 +377,8 @@ class glance::api(
$enable_proxy_headers_parsing = $::os_service_default,
$validate = false,
$validation_options = {},
$limit_param_default = $::os_service_default,
$api_limit_max = $::os_service_default,
# DEPRECATED PARAMETERS
$known_stores = false,
$verbose = undef,
@ -457,6 +468,8 @@ class glance::api(
'DEFAULT/scrub_time': value => $scrub_time;
'DEFAULT/delayed_delete': value => $delayed_delete;
'DEFAULT/image_cache_dir': value => $image_cache_dir;
'DEFAULT/limit_param_default': value => $limit_param_default;
'DEFAULT/api_limit_max': value => $api_limit_max;
'glance_store/os_region_name': value => $os_region_name;
}

5
releasenotes/notes/api-limit-params-b17e7853c8a1b6a6.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
Added the ability to manage the 'limit_param_default' and 'api_limit_max'
options for the glance api.

6
spec/classes/glance_api_spec.rb
View File

@ -38,6 +38,8 @@ describe 'glance::api' do
:taskflow_engine_mode => '<SERVICE DEFAULT>',
:taskflow_max_workers => '<SERVICE DEFAULT>',
:conversion_format => '<SERVICE DEFAULT>',
:limit_param_default => '<SERVICE DEFAULT>',
:api_limit_max => '<SERVICE DEFAULT>',
}
end
@ -66,6 +68,8 @@ describe 'glance::api' do
:image_cache_max_size => '10737418240',
:os_region_name => 'RegionOne2',
:pipeline => 'keystone2',
:limit_param_default => '10',
:api_limit_max => '10',
}
].each do |param_set|
@ -109,6 +113,8 @@ describe 'glance::api' do
'delayed_delete',
'scrub_time',
'image_cache_dir',
'limit_param_default',
'api_limit_max',
].each do |config|
is_expected.to contain_glance_api_config("DEFAULT/#{config}").with_value(param_hash[config.intern])
end