diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-12 14:17:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-12 14:17:36 +0000 |
| commit | cec6d0d3dd547c40d66bbc594d7cd7ae037c6214 (patch) | |
| tree | 2dff653b87ea73491e05543793019d3fa6a86c8a /puppet | |
| parent | ae6883323eaed0a925b128dc53301bfa5995f41d (diff) | |
| parent | 87f41c6ec672cbbdc86c83fb13c35ab234ee618d (diff) | |
Merge "Change the directory for httpd certs/keys to be service-specific"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/apache.yaml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/puppet/services/apache.yaml b/puppet/services/apache.yaml index 9bd282f8..6e53b1f7 100644 --- a/puppet/services/apache.yaml +++ b/puppet/services/apache.yaml @@ -77,13 +77,15 @@ outputs: - "%{hiera('apache_remote_proxy_ips_network')}" - generate_service_certificates: true + tripleo::certmonger::apache_dirs::certificate_dir: '/etc/pki/tls/certs/httpd' + tripleo::certmonger::apache_dirs::key_dir: '/etc/pki/tls/private/httpd' apache_certificates_specs: map_merge: repeat: template: httpd-NETWORK: - service_certificate: '/etc/pki/tls/certs/httpd-NETWORK.crt' - service_key: '/etc/pki/tls/private/httpd-NETWORK.key' + service_certificate: '/etc/pki/tls/certs/httpd/httpd-NETWORK.crt' + service_key: '/etc/pki/tls/private/httpd/httpd-NETWORK.key' hostname: "%{hiera('fqdn_NETWORK')}" principal: "HTTP/%{hiera('fqdn_NETWORK')}" for_each: |