openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Filter apache_certificates_specs if hostname is empty"

This commit is contained in:
Zuul 2019-01-10 21:13:35 +00:00 committed by Gerrit Code Review
parent 1c0572ddb8 a3aeb0b7fa
commit 5f6da8717a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/profile/base/certmonger_user.pp
View File

@ -178,9 +178,12 @@ class tripleo::profile::base::certmonger_user (
include ::tripleo::certmonger::ca::libvirt_vnc
include ::tripleo::certmonger::ca::qemu
unless empty($apache_certificates_specs) {
# Remove apache_certificates_specs where hostname is empty.
# Workaround bug: https://bugs.launchpad.net/tripleo/+bug/1811207
$apache_certificates_specs_filtered = $apache_certificates_specs.filter | $specs, $keys | { ! empty($keys[hostname]) }
unless empty($apache_certificates_specs_filtered) {
include ::tripleo::certmonger::apache_dirs
ensure_resources('tripleo::certmonger::httpd', $apache_certificates_specs,
ensure_resources('tripleo::certmonger::httpd', $apache_certificates_specs_filtered,
{'postsave_cmd' => $apache_postsave_cmd})
}
unless empty($libvirt_certificates_specs) {