From 22ed18fff41949bb6aa4c3448ca09d7eb36c6f3f Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 17 Aug 2022 22:58:02 +0900
Subject: [PATCH] Remove redundant include of apache::mod::*

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
---
 manifests/wsgi/apache.pp                      | 4 ----
 spec/defines/openstacklib_wsgi_apache_spec.rb | 1 -
 2 files changed, 5 deletions(-)

diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index 7169d7fc..2dc9f779 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -287,10 +287,6 @@ define openstacklib::wsgi::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
   $path_real = regsubst($path, '(^/.*)/$', '\1')
diff --git a/spec/defines/openstacklib_wsgi_apache_spec.rb b/spec/defines/openstacklib_wsgi_apache_spec.rb
index f4359b05..5ea47be8 100644
--- a/spec/defines/openstacklib_wsgi_apache_spec.rb
+++ b/spec/defines/openstacklib_wsgi_apache_spec.rb
@@ -45,7 +45,6 @@ describe 'openstacklib::wsgi::apache' do
     it {
       should contain_service('httpd').with_name(platform_params[:httpd_service_name])
       should contain_class('apache')
-      should contain_class('apache::mod::wsgi')
     }
 
     context 'with default parameters' do