Merge "Wallaby and older: Remove heat-dashboard parameters from local_settings" into stable/wallaby
This commit is contained in:
commit
5004eb6520
|
@ -209,6 +209,9 @@ outputs:
|
||||||
horizon::timezone: {get_param: TimeZone}
|
horizon::timezone: {get_param: TimeZone}
|
||||||
horizon::file_upload_temp_dir: '/var/tmp'
|
horizon::file_upload_temp_dir: '/var/tmp'
|
||||||
horizon::help_url: {get_param: HorizonHelpURL}
|
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:
|
- if:
|
||||||
- {get_param: EnableInternalTLS}
|
- {get_param: EnableInternalTLS}
|
||||||
- horizon::horizon_ca: {get_param: InternalTLSCAFile}
|
- horizon::horizon_ca: {get_param: InternalTLSCAFile}
|
||||||
|
|
Loading…
Reference in New Issue