openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Revert "Use the appropriate name for horizon ssl ca parameter" 

Because the dependent patch[1] does not present in stable/victoria
we should not merge this patch until stable/victoria release is created
for TripleO projects.
This revert will be reverted once stable/victoria branch is created.

This reverts commit d3b099fac9.
Resolved conflict caused by the subsequemtn commit[2]

[1] https://review.opendev.org/#/c/758041/
[2] 132c0b1e79

Conflicts:
	deployment/horizon/horizon-container-puppet.yaml

Related-Bug: #1901626
Change-Id: I1cc635715084789602fc40084ba5df4d5790199c
This commit is contained in:
Takashi Kajinami 2020-10-27 08:18:05 +09:00
parent 55c16307ca
commit 8d9621e2e3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/horizon/horizon-container-puppet.yaml
View File

@ -230,7 +230,7 @@ outputs:
-
if:
- internal_tls_enabled
- horizon::ssl_ca: {get_param: InternalTLSCAFile}
- horizon::horizon_ca: {get_param: InternalTLSCAFile}
horizon::ssl_verify_client: true
- {}
-