openstack/puppet-horizon
Code Issues Proposed changes

Merge "update "DROPDOWN_MAX_ITEMS" horizon parameter as a variable"

Browse Source
This commit is contained in:
Zuul 2019-05-27 16:39:13 +00:00 committed by Gerrit Code Review
commit cae9084e76
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/init.pp
View File

@ -88,6 +88,10 @@
# (optional) Maximum number of Swift containers/objects to display # (optional) Maximum number of Swift containers/objects to display
# on a single page. Defaults to 1000. # on a single page. Defaults to 1000.
# #
# [*dropdown_max_items*]
# (optional) Specify a maximum number of items to display in a dropdown.
# Defaults to 30
#
# [*log_handler*] # [*log_handler*]
# (optional) Log handler. Defaults to 'file' # (optional) Log handler. Defaults to 'file'
# #
@ -475,6 +479,7 @@ class horizon(
$secondary_endpoint_type = undef, $secondary_endpoint_type = undef,
$available_regions = undef, $available_regions = undef,
$api_result_limit = 1000, $api_result_limit = 1000,
$dropdown_max_items = 30,
$log_handler = 'file', $log_handler = 'file',
$log_level = 'INFO', $log_level = 'INFO',
$help_url = 'http://docs.openstack.org', $help_url = 'http://docs.openstack.org',

6
releasenotes/notes/add-dropdown_max_items-38ea8e64152d76e5.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
Added new horizon::dropdown_max_items parameter that configures the
DROPDOWN_MAX_ITEMS config option in local_settings.py. Default value
is set to 30 like the Horizon default is.

3
spec/classes/horizon_init_spec.rb
View File

@ -76,6 +76,7 @@ describe 'horizon' do
" 'enable_security_group': True,", " 'enable_security_group': True,",
" 'enable_vpn': False,", " 'enable_vpn': False,",
'API_RESULT_LIMIT = 1000', 'API_RESULT_LIMIT = 1000',
'DROPDOWN_MAX_ITEMS = 30',
'TIME_ZONE = "UTC"', 'TIME_ZONE = "UTC"',
'COMPRESS_OFFLINE = True', 'COMPRESS_OFFLINE = True',
"FILE_UPLOAD_TEMP_DIR = '/tmp'", "FILE_UPLOAD_TEMP_DIR = '/tmp'",
@ -111,6 +112,7 @@ describe 'horizon' do
:django_debug => true, :django_debug => true,
:site_branding => 'mysite', :site_branding => 'mysite',
:api_result_limit => 4682, :api_result_limit => 4682,
:dropdown_max_items => 123,
:compress_offline => false, :compress_offline => false,
:hypervisor_options => {'can_set_mount_point' => false, 'can_set_password' => true }, :hypervisor_options => {'can_set_mount_point' => false, 'can_set_password' => true },
:cinder_options => {'enable_backup' => true }, :cinder_options => {'enable_backup' => true },
@ -198,6 +200,7 @@ describe 'horizon' do
'OPENSTACK_ENDPOINT_TYPE = "internalURL"', 'OPENSTACK_ENDPOINT_TYPE = "internalURL"',
'SECONDARY_ENDPOINT_TYPE = "ANY-VALUE"', 'SECONDARY_ENDPOINT_TYPE = "ANY-VALUE"',
'API_RESULT_LIMIT = 4682', 'API_RESULT_LIMIT = 4682',
'DROPDOWN_MAX_ITEMS = 123',
'TIME_ZONE = "Asia/Shanghai"', 'TIME_ZONE = "Asia/Shanghai"',
"AVAILABLE_THEMES = [", "AVAILABLE_THEMES = [",
" ('default', 'Default', 'themes/default'),", " ('default', 'Default', 'themes/default'),",

2
templates/local_settings.py.erb
View File

@ -585,7 +585,7 @@ API_RESULT_PAGE_SIZE = 20
#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 DROPDOWN_MAX_ITEMS = <%= @dropdown_max_items %>
# 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.