openstack/puppet-manila
Code Issues Proposed changes

Clean up direct dependencies on puppetlabs-apache

Browse Source 
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: Ib925b7e034718d4d692fe49bd0e629820868b3a9
This commit is contained in:
Takashi Kajinami 2021-12-08 22:37:26 +09:00
parent 95c4a97982
commit 1c9d907832
4 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/api.pp
View File

@ -123,7 +123,6 @@ class manila::api (
} elsif $service_name == 'httpd' {
# We need to make sure manila-api/eventlet is stopped before trying to
# start apache
include apache::params
service { 'manila-api':
ensure => 'stopped',
name => $::manila::params::api_service,

5
manifests/wsgi/apache.pp
View File

@ -136,11 +136,6 @@ class manila::wsgi::apache (
include manila::deps
include manila::params
include apache
include apache::mod::wsgi
if $ssl_real {
include apache::mod::ssl
}
::openstacklib::wsgi::apache { 'manila_wsgi':
bind_host => $bind_host,

4
metadata.json
View File

@ -24,10 +24,6 @@
{
"name": "openstack/oslo",
"version_requirement": ">=20.0.0 <21.0.0"
},
{
"name": "puppetlabs/apache",
"version_requirement": ">=5.0.0"
}
],
"description": "Installs and configures OpenStack Manila (Shared Filesystems).",

10
spec/classes/manila_wsgi_apache_spec.rb
View File

@ -5,9 +5,6 @@ describe 'manila::wsgi::apache' do
shared_examples_for 'apache serving manila with mod_wsgi' do
context 'with default parameters' do
it { is_expected.to contain_class('manila::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('manila_wsgi').with(
:bind_port => 8786,
:group => 'manila',
@ -47,9 +44,6 @@ describe 'manila::wsgi::apache' do
}
end
it { is_expected.to contain_class('manila::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('manila_wsgi').with(
:bind_host => '10.42.51.1',
:bind_port => 12345,
@ -93,15 +87,11 @@ describe 'manila::wsgi::apache' do
case facts[:osfamily]
when 'Debian'
{
:httpd_service_name => 'apache2',
:httpd_ports_file => '/etc/apache2/ports.conf',
:wsgi_script_path => '/usr/lib/cgi-bin/manila',
:wsgi_script_source => '/usr/bin/manila-wsgi'
}
when 'RedHat'
{
:httpd_service_name => 'httpd',
:httpd_ports_file => '/etc/httpd/conf/ports.conf',
:wsgi_script_path => '/var/www/cgi-bin/manila',
:wsgi_script_source => '/usr/bin/manila-wsgi'
}