Merge "Stop overriding default value for some limit options"
This commit is contained in:
commit
041da00755
@ -124,15 +124,15 @@
|
|||||||
# [*api_result_limit*]
|
# [*api_result_limit*]
|
||||||
# (optional) Maximum number of objects (Swift containers/objects or images)
|
# (optional) Maximum number of objects (Swift containers/objects or images)
|
||||||
# to display on a single page.
|
# to display on a single page.
|
||||||
# Defaults to 1000.
|
# Defaults to undef.
|
||||||
#
|
#
|
||||||
# [*api_result_page_size*]
|
# [*api_result_page_size*]
|
||||||
# (optional) Maximum number of objects retrieved by a single request.
|
# (optional) Maximum number of objects retrieved by a single request.
|
||||||
# Defaults to 20.
|
# Defaults to undef.
|
||||||
#
|
#
|
||||||
# [*dropdown_max_items*]
|
# [*dropdown_max_items*]
|
||||||
# (optional) Specify a maximum number of items to display in a dropdown.
|
# (optional) Specify a maximum number of items to display in a dropdown.
|
||||||
# Defaults to 30
|
# Defaults to undef.
|
||||||
#
|
#
|
||||||
# [*log_handlers*]
|
# [*log_handlers*]
|
||||||
# (optional) Log handlers. Defaults to ['file']
|
# (optional) Log handlers. Defaults to ['file']
|
||||||
@ -590,9 +590,9 @@ class horizon(
|
|||||||
$secondary_endpoint_type = undef,
|
$secondary_endpoint_type = undef,
|
||||||
$openstack_keystone_endpoint_type = undef,
|
$openstack_keystone_endpoint_type = undef,
|
||||||
$available_regions = undef,
|
$available_regions = undef,
|
||||||
$api_result_limit = 1000,
|
$api_result_limit = undef,
|
||||||
$api_result_page_size = 20,
|
$api_result_page_size = undef,
|
||||||
$dropdown_max_items = 30,
|
$dropdown_max_items = undef,
|
||||||
$log_handlers = ['file'],
|
$log_handlers = ['file'],
|
||||||
$log_level = 'INFO',
|
$log_level = 'INFO',
|
||||||
$django_log_level = undef,
|
$django_log_level = undef,
|
||||||
|
@ -76,9 +76,6 @@ describe 'horizon' do
|
|||||||
" 'enable_ha_router': False,",
|
" 'enable_ha_router': False,",
|
||||||
" 'enable_quotas': True,",
|
" 'enable_quotas': True,",
|
||||||
" 'enable_security_group': True,",
|
" 'enable_security_group': True,",
|
||||||
'API_RESULT_LIMIT = 1000',
|
|
||||||
'API_RESULT_PAGE_SIZE = 20',
|
|
||||||
'DROPDOWN_MAX_ITEMS = 30',
|
|
||||||
'TIME_ZONE = "UTC"',
|
'TIME_ZONE = "UTC"',
|
||||||
" 'handlers': ['file'],",
|
" 'handlers': ['file'],",
|
||||||
'COMPRESS_OFFLINE = True',
|
'COMPRESS_OFFLINE = True',
|
||||||
|
@ -622,14 +622,21 @@ OPENSTACK_KEYSTONE_ENDPOINT_TYPE = "<%= @openstack_keystone_endpoint_type %>"
|
|||||||
# to paginate results.
|
# to paginate results.
|
||||||
#API_RESULT_LIMIT = 1000
|
#API_RESULT_LIMIT = 1000
|
||||||
#API_RESULT_PAGE_SIZE = 20
|
#API_RESULT_PAGE_SIZE = 20
|
||||||
|
<% if !(@api_result_limit.nil?) -%>
|
||||||
API_RESULT_LIMIT = <%= @api_result_limit %>
|
API_RESULT_LIMIT = <%= @api_result_limit %>
|
||||||
|
<% end -%>
|
||||||
|
<% if !(@api_result_page_size.nil?) -%>
|
||||||
API_RESULT_PAGE_SIZE = <%= @api_result_page_size %>
|
API_RESULT_PAGE_SIZE = <%= @api_result_page_size %>
|
||||||
|
<% end -%>
|
||||||
|
|
||||||
# The size of chunk in bytes for downloading objects from Swift
|
# The size of chunk in bytes for downloading objects from Swift
|
||||||
#SWIFT_FILE_TRANSFER_CHUNK_SIZE = 512 * 1024
|
#SWIFT_FILE_TRANSFER_CHUNK_SIZE = 512 * 1024
|
||||||
|
|
||||||
# Specify a maximum number of items to display in a dropdown.
|
# Specify a maximum number of items to display in a dropdown.
|
||||||
|
#DROPDOWN_MAX_ITEMS = 30
|
||||||
|
<% if !(@dropdown_max_items.nil?) -%>
|
||||||
DROPDOWN_MAX_ITEMS = <%= @dropdown_max_items %>
|
DROPDOWN_MAX_ITEMS = <%= @dropdown_max_items %>
|
||||||
|
<% end -%>
|
||||||
|
|
||||||
# The timezone of the server. This should correspond with the timezone
|
# The timezone of the server. This should correspond with the timezone
|
||||||
# of your entire OpenStack installation, and hopefully be in UTC.
|
# of your entire OpenStack installation, and hopefully be in UTC.
|
||||||
|
Loading…
Reference in New Issue
Block a user