From 08a67720db068f41358ea6e863aa12639dc4a534 Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Thu, 18 Jun 2020 13:51:26 +0200 Subject: [PATCH] Let apache module purge config Otherwise can cause issues when enabling prefork as mpm_event is enabled by default in httpd. A recent change in puppet-apache [1] has added httpd.modules.conf directory to load, which includes default mpm config that conflicts with prefork. In the past we disabled purge because of issues with nagios [2], however nagios deployment is not longer supported by packstack, so we can safely enable apache config purge which is the default option. [1] https://github.com/puppetlabs/puppetlabs-apache/commit/6425cc46a841fa6ea5bb3f34b8f31d86c14e6914 [2] https://github.com/redhat-openstack/packstack/commit/686625e17b19c31b9640c64263d9d3bb2bab48c7 Change-Id: Ifdccd8609658b3170b8356bddc5062f252677d40 --- packstack/puppet/modules/packstack/manifests/apache.pp | 2 -- 1 file changed, 2 deletions(-) diff --git a/packstack/puppet/modules/packstack/manifests/apache.pp b/packstack/puppet/modules/packstack/manifests/apache.pp index 5eaa2521e..47d610d06 100644 --- a/packstack/puppet/modules/packstack/manifests/apache.pp +++ b/packstack/puppet/modules/packstack/manifests/apache.pp @@ -3,7 +3,6 @@ class packstack::apache () # Use python3 for mod_wsg in fedora if ($::operatingsystem == 'Fedora') or ($::osfamily == 'RedHat' and Integer.new($::operatingsystemmajrelease) > 7) { class { '::apache': - purge_configs => false, mod_packages => merge($::apache::params::mod_packages, { 'wsgi' => 'python3-mod_wsgi', }), @@ -13,7 +12,6 @@ class packstack::apache () } }else{ class {'::apache': - purge_configs => false, } }