openstack/puppet-openstack-integration
Code Issues Proposed changes

Clean up unnecessary workaround related to puppetlabs-apache

Browse Source 
Since v5.6.0, mod_packages[1] and mod_libs[2] are automatically set
to the appropriate value in CentOS8, so we don't need to set these
parameters explicitly.

[1] https://github.com/puppetlabs/puppetlabs-apache/commit/d346b76d1
[2] https://github.com/puppetlabs/puppetlabs-apache/commit/f31e392a6

Change-Id: Iab5964f54d0e5de0538e02b59ec5be0cdcf926d5
This commit is contained in:
Takashi Kajinami 2021-05-02 23:34:36 +09:00
parent 1ed059127e
commit 7424f811af
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/apache.pp
View File

@ -4,23 +4,13 @@ class openstack_integration::apache {
include openstack_integration::config
if ($::os['family'] == 'Debian') {
$wsgi_mod_package = 'libapache2-mod-wsgi-py3'
$wsgi_mod_lib = 'mod_wsgi.so'
}
elsif ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
$wsgi_mod_package = 'python3-mod_wsgi'
$wsgi_mod_lib = 'mod_wsgi_python3.so'
}
if ($::os['family'] == 'Debian') or ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
include apache::params
class { 'apache':
mod_packages => merge($::apache::params::mod_packages, {
'wsgi' => $wsgi_mod_package,
'wsgi' => 'libapache2-mod-wsgi-py3',
}),
mod_libs => merge($::apache::params::mod_libs, {
'wsgi' => $wsgi_mod_lib,
'wsgi' => 'mod_wsgi.so',
})
}
}