Merge "Remove redundant include of apache::mod::*"
This commit is contained in:
commit
f6186f45bd
@ -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')
|
||||||
|
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user