diff options
| author |   Lukas Bezdicka <lbezdick@redhat.com> | 2017-04-13 19:21:45 +0200 |
|---|---|---|
| committer | Lukas Bezdicka <lbezdick@redhat.com> | 2017-04-18 17:07:46 +0200 |
| commit | 9e729c0db22865d036860346eb6b81c4c2108719 (patch) | |
| tree | 384ab7e5fa29d593e93f6df49701ee56278c6545 /manifests/profile/base/ceilometer | |
| parent | de791082c75d687dc5f1cf7bacdd78859edb475a (diff) | |
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
Diffstat (limited to 'manifests/profile/base/ceilometer')
| -rw-r--r-- | manifests/profile/base/ceilometer/api.pp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/manifests/profile/base/ceilometer/api.pp b/manifests/profile/base/ceilometer/api.pp index 28504c5..1aa4285 100644 --- a/manifests/profile/base/ceilometer/api.pp +++ b/manifests/profile/base/ceilometer/api.pp @@ -65,6 +65,7 @@ class tripleo::profile::base::ceilometer::api ( if $step >= 4 { include ::ceilometer::api + include ::apache::mod::ssl class { '::ceilometer::wsgi::apache': ssl_cert => $tls_certfile, ssl_key => $tls_keyfile, |