Clean up direct dependencies on puppetlabs-apache

This change removes direct reference to some classes in
puppetlabs-apache. Details are explained below.

- The api class doesn't need access to anything defined in
  apache::params

- The following classes are included by the openstacklib::wsgi::apache
  resource type, and current inclusions are just redundant.

Change-Id: I4f103dc90dd0cb92d94bdc5edcdb9557262ff8e0

manifests/wsgi/apache_api.pp

@@ -135,11 +135,6 @@ class nova::wsgi::apache_api (
   $ssl_real = pick($ssl, true)
 
   include nova::params
-  include apache
-  include apache::mod::wsgi
-  if $ssl_real {
-    include apache::mod::ssl
-  }
 
   if ! defined(Class[nova::api]) {
     fail('::nova::api class must be declared in composition layer.')

manifests/wsgi/apache_metadata.pp

@@ -122,11 +122,6 @@ class nova::wsgi::apache_metadata (
   $ssl_real = pick($ssl, true)
 
   include nova::params
-  include apache
-  include apache::mod::wsgi
-  if $ssl_real {
-    include apache::mod::ssl
-  }
 
   nova::generic_service { 'metadata-api':
     service_name   => false,

metadata.json

@@ -1,10 +1,6 @@
 {
     "author": "Puppet Labs and OpenStack Contributors",
     "dependencies": [
-        {
-            "name": "puppetlabs/apache",
-            "version_requirement": ">=5.0.0"
-        },
         {
             "name": "joshuabaird/ipaclient",
             "version_requirement": ">=2.5.1"

spec/classes/nova_wsgi_apache_api_spec.rb

@@ -14,9 +14,6 @@ describe 'nova::wsgi::apache_api' do
          }"
       end
       it { is_expected.to contain_class('nova::params') }
-      it { is_expected.to contain_class('apache') }
-      it { is_expected.to contain_class('apache::mod::wsgi') }
-      it { is_expected.to contain_class('apache::mod::ssl') }
       it { is_expected.to contain_openstacklib__wsgi__apache('nova_api_wsgi').with(
         :bind_port                   => 8774,
         :group                       => 'nova',
@@ -68,9 +65,6 @@ describe 'nova::wsgi::apache_api' do
       end
 
       it { is_expected.to contain_class('nova::params') }
-      it { is_expected.to contain_class('apache') }
-      it { is_expected.to contain_class('apache::mod::wsgi') }
-      it { is_expected.to_not contain_class('apache::mod::ssl') }
       it { is_expected.to contain_openstacklib__wsgi__apache('nova_api_wsgi').with(
         :bind_host                   => '10.42.51.1',
         :bind_port                   => 12345,

spec/classes/nova_wsgi_apache_metadata_spec.rb

@@ -12,9 +12,6 @@ describe 'nova::wsgi::apache_metadata' do
          class { 'nova::metadata': }"
       end
       it { is_expected.to contain_class('nova::params') }
-      it { is_expected.to contain_class('apache') }
-      it { is_expected.to contain_class('apache::mod::wsgi') }
-      it { is_expected.to contain_class('apache::mod::ssl') }
       it { is_expected.to contain_openstacklib__wsgi__apache('nova_metadata_wsgi').with(
         :bind_port                   => 8775,
         :group                       => 'nova',
@@ -64,9 +61,6 @@ describe 'nova::wsgi::apache_metadata' do
       end
 
       it { is_expected.to contain_class('nova::params') }
-      it { is_expected.to contain_class('apache') }
-      it { is_expected.to contain_class('apache::mod::wsgi') }
-      it { is_expected.to_not contain_class('apache::mod::ssl') }
       it { is_expected.to contain_openstacklib__wsgi__apache('nova_metadata_wsgi').with(
         :bind_host                   => '10.42.51.1',
         :bind_port                   => 12345,