From 8fd4c8fae6db538bb3f95b5e6bb69617dcf02bee Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 3 Aug 2023 23:12:57 +0900 Subject: [PATCH] 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 | 1 - manifests/apache.pp | 10 +--------- manifests/barbican.pp | 1 - manifests/cinder.pp | 1 - manifests/designate.pp | 1 - manifests/gnocchi.pp | 1 - manifests/heat.pp | 1 - manifests/ironic.pp | 1 - manifests/keystone.pp | 1 - manifests/manila.pp | 1 - manifests/mistral.pp | 1 - manifests/nova.pp | 1 - manifests/octavia.pp | 1 - manifests/placement.pp | 1 - manifests/sahara.pp | 1 - manifests/trove.pp | 1 - manifests/vitrage.pp | 1 - manifests/watcher.pp | 1 - manifests/zaqar.pp | 1 - 19 files changed, 1 insertion(+), 27 deletions(-) diff --git a/manifests/aodh.pp b/manifests/aodh.pp index a206681d5..74f1e5603 100644 --- a/manifests/aodh.pp +++ b/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, diff --git a/manifests/apache.pp b/manifests/apache.pp index d613d0913..842a8bb09 100644 --- a/manifests/apache.pp +++ b/manifests/apache.pp @@ -2,13 +2,5 @@ class openstack_integration::apache { include openstack_integration::params include openstack_integration::config - - if ($facts['os']['family'] == 'Debian') { - include apache::params - class { 'apache': - mod_packages => merge($::apache::params::mod_packages, { - 'wsgi' => 'libapache2-mod-wsgi-py3', - }) - } - } + include apache } diff --git a/manifests/barbican.pp b/manifests/barbican.pp index 62b23c12e..7c0a31c6f 100644 --- a/manifests/barbican.pp +++ b/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, diff --git a/manifests/cinder.pp b/manifests/cinder.pp index f61433635..2d38a5c86 100644 --- a/manifests/cinder.pp +++ b/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, diff --git a/manifests/designate.pp b/manifests/designate.pp index 50526ca61..324c65dec 100644 --- a/manifests/designate.pp +++ b/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", diff --git a/manifests/gnocchi.pp b/manifests/gnocchi.pp index c2632e9b2..fd117fa82 100644 --- a/manifests/gnocchi.pp +++ b/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, diff --git a/manifests/heat.pp b/manifests/heat.pp index 022426c60..7613942f6 100644 --- a/manifests/heat.pp +++ b/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, diff --git a/manifests/ironic.pp b/manifests/ironic.pp index 32f4da904..32bba0eee 100644 --- a/manifests/ironic.pp +++ b/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, diff --git a/manifests/keystone.pp b/manifests/keystone.pp index a81d2b7fc..65f34d60e 100644 --- a/manifests/keystone.pp +++ b/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, diff --git a/manifests/manila.pp b/manifests/manila.pp index 588fbefc6..2515948a7 100644 --- a/manifests/manila.pp +++ b/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, diff --git a/manifests/mistral.pp b/manifests/mistral.pp index 3e66a5c56..d4ef67df5 100644 --- a/manifests/mistral.pp +++ b/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, diff --git a/manifests/nova.pp b/manifests/nova.pp index 2f6a01a92..62b2195ec 100644 --- a/manifests/nova.pp +++ b/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", diff --git a/manifests/octavia.pp b/manifests/octavia.pp index 84df4180e..6271adf07 100644 --- a/manifests/octavia.pp +++ b/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, diff --git a/manifests/placement.pp b/manifests/placement.pp index 0482580f1..2693bf794 100644 --- a/manifests/placement.pp +++ b/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, diff --git a/manifests/sahara.pp b/manifests/sahara.pp index 4028dad65..97b35f54b 100644 --- a/manifests/sahara.pp +++ b/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, diff --git a/manifests/trove.pp b/manifests/trove.pp index d68182f72..0157c6d0a 100644 --- a/manifests/trove.pp +++ b/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, diff --git a/manifests/vitrage.pp b/manifests/vitrage.pp index 2b43afdd7..2a21735cf 100644 --- a/manifests/vitrage.pp +++ b/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, diff --git a/manifests/watcher.pp b/manifests/watcher.pp index a30c71544..25431f245 100644 --- a/manifests/watcher.pp +++ b/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, diff --git a/manifests/zaqar.pp b/manifests/zaqar.pp index d274b62dd..a74b22d69 100644 --- a/manifests/zaqar.pp +++ b/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,