openstack
/
puppet-horizon
Code Issues Proposed changes

Drop removed parameters from loca_settings.py template 

The following parmaeters were already removed from horizon,
so we can remove the from the teamplte file.
 - FLAVOR_EXTRA_KEYS[1]
 - SAHARA_AUTO_IP_ALLOCATION_ENABLED[2]
 - OPENSTACK_TOKEN_HASH_ALGORITHM[3]
 - OPENSTACK_TOKEN_HASH_ENABLED[4]

[1] 5101ebdc2814fc80c63419eee85291d8340fd078
[2] 0659f9a98a2f175847c7acb005ac8126d03059bc
[3] 069329eeb220f6fd49670894e4d45a1e3ec59c4f
[4] 71993e3c983b113ce5672fd1291e6a1200fd5a7b

Change-Id: Ie1c4fdfc5f95ce3103beea311223ec78597a38ec
This commit is contained in:
Takashi Kajinami 2020-04-09 22:41:07 +09:00
parent faaaa4a773
commit fef2af55e8
1 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
templates/local_settings.py.erb
View File

@ -973,43 +973,6 @@ FILE_UPLOAD_TEMP_DIR = '<%= @file_upload_temp_dir %>'
OVERVIEW_DAYS_RANGE = <%= @overview_days_range %>
<% end %>
# Deprecation Notice:
#
# The setting FLAVOR_EXTRA_KEYS has been deprecated.
# Please load extra spec metadata into the Glance Metadata Definition Catalog.
#
# The sample quota definitions can be found in:
# <glance_source>/etc/metadefs/compute-quota.json
#
# The metadata definition catalog supports CLI and API:
# $glance --os-image-api-version 2 help md-namespace-import
# $glance-manage db_load_metadefs <directory_with_definition_files>
#
# See Metadata Definitions on: https://docs.openstack.org/glance/latest/
# TODO: (david-lyle) remove when plugins support settings natively
# Note: This is only used when the Sahara plugin is configured and enabled
# for use in Horizon.
# Indicate to the Sahara data processing service whether or not
# automatic floating IP allocation is in effect. If it is not
# in effect, the user will be prompted to choose a floating IP
# pool for use in their cluster. False by default. You would want
# to set this to True if you were running Nova Networking with
# auto_assign_floating_ip = True.
#SAHARA_AUTO_IP_ALLOCATION_ENABLED = False
# The hash algorithm to use for authentication tokens. This must
# match the hash algorithm that the identity server and the
# auth_token middleware are using. Allowed values are the
# algorithms supported by Python's hashlib library.
#OPENSTACK_TOKEN_HASH_ALGORITHM = 'md5'
# Hashing tokens from Keystone keeps the Horizon session data smaller, but it
# doesn't work in some cases when using PKI tokens. Uncomment this value and
# set it to False if using PKI tokens and there are 401 errors due to token
# hashing.
#OPENSTACK_TOKEN_HASH_ENABLED = True
# 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