Merge "Do not hard-code REST_API_REQUIRED_SETTINGS"

This commit is contained in:
Zuul 2022-01-15 16:33:05 +00:00 committed by Gerrit Code Review
commit effcfb2be7
2 changed files with 6 additions and 18 deletions

View File

@ -0,0 +1,6 @@
---
fixes:
- |
`Bug #1956904 <https://bugs.launchpad.net/puppet-horizon/+bug/1956904>`_:
The hard-coded ``REST_API_REQUIRED_SETTINGS`` parameter was removed, to use
the default value defined in Horizon itself.

View File

@ -1017,24 +1017,6 @@ FILE_UPLOAD_TEMP_DIR = '<%= @file_upload_temp_dir %>'
OVERVIEW_DAYS_RANGE = <%= @overview_days_range %> OVERVIEW_DAYS_RANGE = <%= @overview_days_range %>
<% end %> <% end %>
# AngularJS requires some settings to be made available to
# the client side. Some settings are required by in-tree / built-in horizon
# features. These settings must be added to REST_API_REQUIRED_SETTINGS in the
# form of ['SETTING_1','SETTING_2'], etc.
#
# You may remove settings from this list for security purposes, but do so at
# the risk of breaking a built-in horizon feature. These settings are required
# for horizon to function properly. Only remove them if you know what you
# are doing. These settings may in the future be moved to be defined within
# the enabled panel configuration.
# You should not add settings to this list for out of tree extensions.
# See: https://wiki.openstack.org/wiki/Horizon/RESTAPI
REST_API_REQUIRED_SETTINGS = ['OPENSTACK_HYPERVISOR_FEATURES',
'LAUNCH_INSTANCE_DEFAULTS',
'OPENSTACK_IMAGE_FORMATS',
'CREATE_IMAGE_DEFAULTS',
'OPENSTACK_KEYSTONE_BACKEND',]
# Additional settings can be made available to the client side for # Additional settings can be made available to the client side for
# extensibility by specifying them in REST_API_ADDITIONAL_SETTINGS # extensibility by specifying them in REST_API_ADDITIONAL_SETTINGS
# !! Please use extreme caution as the settings are transferred via HTTP/S # !! Please use extreme caution as the settings are transferred via HTTP/S