openstack/puppet-keystone
Code Issues Proposed changes

Make the SSL apache module happens at correct time

Browse Source 
This commit will make sure that the entire Class[apache::mod::ssl]
  completes before the file resource that purges the conf.d director
  runs.

  This is needed because the mod_ssl package on EL is putting down a
  ssl.conf file in the conf.d directory after the purge, resulting in it
  only being removed on a the second Puppet run.  I'd probably consider
  this a bug is puppetlabs-apache or upstream EL packaging but for now,
  this is the workaround.

Change-Id: I96d3028aefe423ebd03b843380fb073a85f778d7
This commit is contained in:
Cody Herriges
2016-04-05 14:21:03 -07:00
parent 51b8e2ce96
commit 96ba3fa800
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/wsgi/apache.pp
View File

@@ -178,6 +178,11 @@ class keystone::wsgi::apache (
include ::apache::mod::wsgi include ::apache::mod::wsgi
if $ssl { if $ssl {
include ::apache::mod::ssl include ::apache::mod::ssl
# This is probably a bug in Class[apache::mod::ssl] or in the mod_ssl EL
# package but for now I want this to pass p-o-i CI. The issue is that the
# mod_ssl package is placing a ssl.conf file after the confd_dir is purged
# on Puppet 4.
Class['::apache::mod::ssl'] -> File[$::apache::confd_dir]
} }
# The httpd package is untagged, but needs to have ordering enforced, # The httpd package is untagged, but needs to have ordering enforced,