From 8d9621e2e3161484b24bb41e2183e25a9ee98f67 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 27 Oct 2020 08:18:05 +0900 Subject: [PATCH] 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 d3b099fac949bed6e5da0660b13509cf391ca571. Resolved conflict caused by the subsequemtn commit[2] [1] https://review.opendev.org/#/c/758041/ [2] 132c0b1e792084664920fc8ac6c984cb4d1b823d Conflicts: deployment/horizon/horizon-container-puppet.yaml Related-Bug: #1901626 Change-Id: I1cc635715084789602fc40084ba5df4d5790199c --- deployment/horizon/horizon-container-puppet.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/horizon/horizon-container-puppet.yaml b/deployment/horizon/horizon-container-puppet.yaml index 04e3da79cb..e84a2ef54c 100644 --- a/deployment/horizon/horizon-container-puppet.yaml +++ b/deployment/horizon/horizon-container-puppet.yaml @@ -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 - {} -