Merge "Only set apache certificates if TLS everywhere is enabled"

This commit is contained in:
Jenkins 2017-05-17 15:37:49 +00:00 committed by Gerrit Code Review
commit 1324f2f1c9

@ -84,6 +84,8 @@ outputs:
apache::mod::prefork::serverlimit: { get_param: ApacheServerLimit }
apache::mod::remoteip::proxy_ips:
- "%{hiera('apache_remote_proxy_ips_network')}"
- if:
- internal_tls_enabled
-
generate_service_certificates: true
tripleo::certmonger::apache_dirs::certificate_dir: '/etc/pki/tls/certs/httpd'
@ -99,6 +101,7 @@ outputs:
principal: "HTTP/%{hiera('fqdn_NETWORK')}"
for_each:
NETWORK: {get_attr: [ApacheNetworks, value]}
- {}
metadata_settings:
if:
- internal_tls_enabled