diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-09-07 11:32:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-09-07 11:32:18 +0000 |
| commit | adc76719fb790302be3f8aca96029d58b5ee8351 (patch) | |
| tree | 993cbc4776ea8802b36a662529746b69d2e35860 /puppet/services/haproxy-public-tls-certmonger.yaml | |
| parent | a38bd9eee95eecb6665d1529c3a24b33af50ed5a (diff) | |
| parent | cbcfb59e1d95de21d591d33f5c2d91197c83b0a3 (diff) | |
Merge "Use DeployedSSLCertificatePath for public TLS via certmonger" into stable/pike
Diffstat (limited to 'puppet/services/haproxy-public-tls-certmonger.yaml')
| -rw-r--r-- | puppet/services/haproxy-public-tls-certmonger.yaml | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/puppet/services/haproxy-public-tls-certmonger.yaml b/puppet/services/haproxy-public-tls-certmonger.yaml index 14d171dc..cdfc41cf 100644 --- a/puppet/services/haproxy-public-tls-certmonger.yaml +++ b/puppet/services/haproxy-public-tls-certmonger.yaml @@ -36,6 +36,11 @@ parameters: HAProxyInternalTLSKeysDirectory: default: '/etc/pki/tls/private/haproxy' type: string + DeployedSSLCertificatePath: + default: '/etc/pki/tls/private/overcloud_endpoint.pem' + description: > + The filepath of the certificate as it will be stored in the controller. + type: string outputs: role_data: @@ -44,22 +49,14 @@ outputs: service_name: haproxy_public_tls_certmonger config_settings: generate_service_certificates: true - tripleo::haproxy::service_certificate: - list_join: - - '' - - - {get_param: HAProxyInternalTLSCertsDirectory} - - '/overcloud-haproxy-external.pem' + tripleo::haproxy::service_certificate: {get_param: DeployedSSLCertificatePath} tripleo::certmonger::haproxy_dirs::certificate_dir: get_param: HAProxyInternalTLSCertsDirectory tripleo::certmonger::haproxy_dirs::key_dir: get_param: HAProxyInternalTLSKeysDirectory certificates_specs: haproxy-external: - service_pem: - list_join: - - '' - - - {get_param: HAProxyInternalTLSCertsDirectory} - - '/overcloud-haproxy-external.pem' + service_pem: {get_param: DeployedSSLCertificatePath} service_certificate: list_join: - '' |