From fdcd81de3e20ba6df2aafb1be64e5cd81136d3ab Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 21 Sep 2021 09:26:02 +0900 Subject: [PATCH] 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 ff66c15547e6b1dbfe31d79b5852099ba16384ac) --- deployment/horizon/horizon-container-puppet.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deployment/horizon/horizon-container-puppet.yaml b/deployment/horizon/horizon-container-puppet.yaml index c2ce4b8d0a..35fcd5addf 100644 --- a/deployment/horizon/horizon-container-puppet.yaml +++ b/deployment/horizon/horizon-container-puppet.yaml @@ -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