openstack/puppet-openstacklib
Code Issues Proposed changes

Remove redundant include of apache::mod::*

Browse Source 
The puppetlabs-apache module includes the classes for required modules
automatically based on the parameters used in apache::vhost.

apache::mod::wsgi
https://github.com/puppetlabs/puppetlabs-apache/commit/efffa854f
(available since 1.1.0)

apache::mod::ssl
https://github.com/puppetlabs/puppetlabs-apache/commit/ee37f2146
(available since 0.3.0)

Change-Id: I6fd1ba6b721940ff96f977782e1e15df6191413d
This commit is contained in:
Takashi Kajinami
2022-08-17 22:58:02 +09:00
parent ba19e6dbd3
commit 22ed18fff4
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/wsgi/apache.pp
View File

@@ -287,10 +287,6 @@ define openstacklib::wsgi::apache (
) { ) {
include apache include apache
include apache::mod::wsgi
if $ssl {
include apache::mod::ssl
}
# Ensure there's no trailing '/' except if this is also the only character # Ensure there's no trailing '/' except if this is also the only character
$path_real = regsubst($path, '(^/.*)/$', '\1') $path_real = regsubst($path, '(^/.*)/$', '\1')

1
spec/defines/openstacklib_wsgi_apache_spec.rb
View File

@@ -45,7 +45,6 @@ describe 'openstacklib::wsgi::apache' do
it { it {
should contain_service('httpd').with_name(platform_params[:httpd_service_name]) should contain_service('httpd').with_name(platform_params[:httpd_service_name])
should contain_class('apache') should contain_class('apache')
should contain_class('apache::mod::wsgi')
} }
context 'with default parameters' do context 'with default parameters' do