From ef4a1da270f92aaf0c4fdb06fadaaec932149d49 Mon Sep 17 00:00:00 2001 From: Lukas Bezdicka Date: Thu, 13 Apr 2017 19:21:45 +0200 Subject: Ensure we configure ssl.conf Every time we call apache module regardless of using SSL we have to configure mod_ssl from puppet-apache or we'll hit issue during package update. File /etc/httpd/conf.d/ssl.conf from mod_ssl package contains Listen 443 while apache::mod::ssl just configures SSL bits but does not add Listen. If the apache::mod::ssl is not included the ssl.conf file is removed and recreated during mod_ssl package update. This causes conflict on port 443. Change-Id: Ic5a0719f67d3795a9edca25284d1cf6f088073e8 Related-Bug: 1682448 Resolves: rhbz#1441977 (cherry picked from commit 9e729c0db22865d036860346eb6b81c4c2108719) --- manifests/profile/base/keystone.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'manifests/profile/base/keystone.pp') diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp index dbd6142..9aa3eb3 100644 --- a/manifests/profile/base/keystone.pp +++ b/manifests/profile/base/keystone.pp @@ -161,6 +161,7 @@ class tripleo::profile::base::keystone ( } include ::keystone::config + include ::apache::mod::ssl class { '::keystone::wsgi::apache': ssl_cert => $tls_certfile, ssl_key => $tls_keyfile, -- cgit 1.2.3-korg