Wallaby and older: Remove heat-dashboard parameters from local_settings
This change ensures the parameters for heat-dashboard are removed
from the base local_settings, because the parameters are now configured
in the independent setting files.
Note this change is required only in Wallaby and older and since Xena
the parameters are no longer included in the base local_settings.
Conflicts:
deployment/horizon/horizon-container-puppet.yaml
Depends-on: https://review.opendev.org/815362
Depends-on: https://review.opendev.org/816330
Change-Id: I1b1ffdd68501d61a03d8153c4fc538b6d26c8344
(cherry picked from commit ff66c15547
)
This commit is contained in:
parent
862a84290f
commit
fdcd81de3e
@ -231,6 +231,9 @@ outputs:
|
||||
horizon::timezone: {get_param: TimeZone}
|
||||
horizon::file_upload_temp_dir: '/var/tmp'
|
||||
horizon::help_url: {get_param: HorizonHelpURL}
|
||||
# NOTE(tkajinam): The heat-dashboard parmaeters are now defined in an independent file,
|
||||
# so should be removed from the base local_settings.
|
||||
horizon::enable_user_pass: 'UNSET'
|
||||
-
|
||||
if:
|
||||
- internal_tls_enabled
|
||||
|
Loading…
Reference in New Issue
Block a user