Fixes generating public certificates

In non-containerized deployments auto-generation of public certificates
fails because the parameter for determining autogeneration is only used
in the docker haproxy service template.  This patch adds it also to the
puppet service.

Closes-Bug: 1742481

Change-Id: I4c6e2e95ee9e24973f4d2943d250ca5314493b3c
Signed-off-by: Tim Rozet <trozet@redhat.com>
This commit is contained in:
Tim Rozet 2018-01-10 11:14:12 -05:00
parent ee371478d7
commit 7be65d2666
2 changed files with 18 additions and 4 deletions

View File

@ -62,6 +62,11 @@ parameters:
description: > description: >
The content of the SSL certificate (without Key) in PEM format. The content of the SSL certificate (without Key) in PEM format.
type: string type: string
PublicSSLCertificateAutogenerated:
default: false
description: >
Whether the public SSL certificate was autogenerated or not.
type: boolean
DeployedSSLCertificatePath: DeployedSSLCertificatePath:
default: '/etc/pki/tls/private/overcloud_endpoint.pem' default: '/etc/pki/tls/private/overcloud_endpoint.pem'
description: > description: >
@ -81,10 +86,14 @@ parameters:
conditions: conditions:
public_tls_enabled: public_tls_enabled:
not: or:
equals: - not:
- {get_param: SSLCertificate} equals:
- "" - {get_param: SSLCertificate}
- ""
- equals:
- {get_param: PublicSSLCertificateAutogenerated}
- true
resources: resources:

View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes generation public certificates for haproxy in a non-containerized
TLS deployment scenario.