Remove workaround for old puppetlabs-apache

The workaround is no longer required since puppetlabs-apache v6.5.0[1].

This also removes the apache class from service manifests because we
should use our own apache manifests to manage the apache service.

[1] https://github.com/puppetlabs/puppetlabs-apache/commit/f4e8c1d2f

Change-Id: I6818cd31cc5d878d141a88d977ea956a4717c17f

manifests/aodh.pp

@@ -85,7 +85,6 @@ class openstack_integration::aodh (
     service_name => 'httpd',
     sync_db      => true,
   }
-  include apache
   class { 'aodh::wsgi::apache':
     bind_host => $::openstack_integration::config::host,
     ssl       => $::openstack_integration::config::ssl,

manifests/apache.pp

@@ -2,13 +2,5 @@ class openstack_integration::apache {
 
   include openstack_integration::params
   include openstack_integration::config
-
+  include apache
-  if ($facts['os']['family'] == 'Debian') {
-    include apache::params
-    class { 'apache':
-      mod_packages => merge($::apache::params::mod_packages, {
-        'wsgi' => 'libapache2-mod-wsgi-py3',
-      })
-    }
-  }
 }

manifests/barbican.pp

@@ -79,7 +79,6 @@ class openstack_integration::barbican {
     db_auto_create              => false,
     rabbit_use_ssl              => $::openstack_integration::config::ssl,
   }
-  include apache
   class { 'barbican::wsgi::apache':
     bind_host => $::openstack_integration::config::host,
     ssl       => $::openstack_integration::config::ssl,

manifests/cinder.pp

@@ -124,7 +124,6 @@ class openstack_integration::cinder (
     public_endpoint     => "${::openstack_integration::config::base_url}:8776",
     service_name        => 'httpd',
   }
-  include apache
   class { 'cinder::wsgi::apache':
     bind_host => $::openstack_integration::config::host,
     ssl       => $::openstack_integration::config::ssl,

manifests/designate.pp

@@ -80,7 +80,6 @@ class openstack_integration::designate {
     enable_api_admin => true,
     service_name     => 'httpd',
   }
-  include apache
   class { 'designate::wsgi::apache':
     bind_host => $::openstack_integration::config::host,
     ssl_key   => "/etc/designate/ssl/private/${facts['networking']['fqdn']}.pem",

manifests/gnocchi.pp

@@ -88,7 +88,6 @@ class openstack_integration::gnocchi (
     enabled      => true,
     service_name => 'httpd',
   }
-  include apache
   class { 'gnocchi::wsgi::apache':
     bind_host => $::openstack_integration::config::host,
     ssl       => $::openstack_integration::config::ssl,

manifests/heat.pp

@@ -107,7 +107,6 @@ class openstack_integration::heat (
   class { 'heat::api':
     service_name => 'httpd',
   }
-  include apache
   class { 'heat::wsgi::apache_api':
     bind_host => $::openstack_integration::config::host,
     ssl       => $::openstack_integration::config::ssl,

manifests/ironic.pp

@@ -73,7 +73,6 @@ class openstack_integration::ironic {
   class { 'ironic::api':
     service_name => 'httpd',
   }
-  include apache
   class { 'ironic::wsgi::apache':
     bind_host => $::openstack_integration::config::host,
     ssl       => $::openstack_integration::config::ssl,

manifests/keystone.pp

@@ -93,7 +93,6 @@ class openstack_integration::keystone (
   class { 'keystone::messaging::amqp':
     amqp_sasl_mechanisms => 'PLAIN',
   }
-  include apache
   class { 'keystone::wsgi::apache':
     bind_host => $::openstack_integration::config::host,
     ssl       => $::openstack_integration::config::ssl,

manifests/manila.pp

@@ -101,7 +101,6 @@ class openstack_integration::manila (
     service_name            => 'httpd',
     enabled_share_protocols => $share_protocol,
   }
-  include apache
   class { 'manila::wsgi::apache':
     bind_host => $::openstack_integration::config::host,
     ssl       => $::openstack_integration::config::ssl,

manifests/mistral.pp

@@ -63,7 +63,6 @@ class openstack_integration::mistral {
   class { 'mistral::api':
     service_name => 'httpd',
   }
-  include apache
   class { 'mistral::wsgi::apache':
     bind_host => $::openstack_integration::config::host,
     ssl       => $::openstack_integration::config::ssl,

manifests/nova.pp

@@ -170,7 +170,6 @@ class openstack_integration::nova (
   class { 'nova::metadata':
     neutron_metadata_proxy_shared_secret => 'a_big_secret',
   }
-  include apache
   class { 'nova::wsgi::apache_api':
     bind_host => $::openstack_integration::config::host,
     ssl_key   => "/etc/nova/ssl/private/${facts['networking']['fqdn']}.pem",

manifests/octavia.pp

@@ -182,7 +182,6 @@ class openstack_integration::octavia (
     sync_db                  => true,
     enabled_provider_drivers => $enabled_provider_drivers,
   }
-  include apache
   class { 'octavia::wsgi::apache':
     bind_host => $::openstack_integration::config::host,
     ssl       => $::openstack_integration::config::ssl,

manifests/placement.pp

@@ -61,7 +61,6 @@ class openstack_integration::placement {
     }
   }
   include placement::api
-  include apache
   if ($facts['os']['name'] != 'Debian') {
     class { 'placement::wsgi::apache':
       bind_host => $::openstack_integration::config::host,

manifests/sahara.pp

@@ -76,7 +76,6 @@ class openstack_integration::sahara (
   class { 'sahara::service::api':
     service_name => 'httpd',
   }
-  include apache
   class { 'sahara::wsgi::apache':
     bind_host => $::openstack_integration::config::host,
     ssl       => $::openstack_integration::config::ssl,

manifests/trove.pp

@@ -74,7 +74,6 @@ class openstack_integration::trove {
     password => 'a_big_secret',
     auth_url => $::openstack_integration::config::keystone_auth_uri,
   }
-  include apache
   class { 'trove::wsgi::apache':
     bind_host => $::openstack_integration::config::host,
     ssl       => $::openstack_integration::config::ssl,

manifests/vitrage.pp

@@ -99,7 +99,6 @@ class openstack_integration::vitrage {
     enabled      => true,
     service_name => 'httpd',
   }
-  include apache
   class { 'vitrage::wsgi::apache':
     bind_host => $::openstack_integration::config::host,
     ssl       => $::openstack_integration::config::ssl,

manifests/watcher.pp

@@ -81,7 +81,6 @@ class openstack_integration::watcher {
     upgrade_db   => true,
     service_name => 'httpd',
   }
-  include apache
   class { 'watcher::wsgi::apache':
     bind_host => $::openstack_integration::config::host,
     ssl       => $::openstack_integration::config::ssl,

manifests/zaqar.pp

@@ -62,7 +62,6 @@ class openstack_integration::zaqar {
   class {'zaqar::server':
     service_name => 'httpd',
   }
-  include apache
   class { 'zaqar::wsgi::apache':
     bind_host => $::openstack_integration::config::host,
     ssl       => $::openstack_integration::config::ssl,