openstack
/
puppet-vitrage
Code Issues Proposed changes

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: I513d815b8b44f17b002a7904499ec82f1acf6614
This commit is contained in:
Takashi Kajinami 2021-12-08 22:56:49 +09:00
parent 534a2c3627
commit 07dacc6cc3
3 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/api.pp
View File

@ -79,7 +79,6 @@ class vitrage::api (
tag => 'vitrage-service',
}
} elsif $service_name == 'httpd' {
include apache::params
service { 'vitrage-api':
ensure => 'stopped',
name => $::vitrage::params::api_service_name,

5
manifests/wsgi/apache.pp
View File

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

6
spec/classes/vitrage_wsgi_apache_spec.rb
View File

@ -5,9 +5,6 @@ describe 'vitrage::wsgi::apache' do
shared_examples_for 'apache serving vitrage with mod_wsgi' do
context 'with default parameters' do
it { is_expected.to contain_class('vitrage::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('vitrage_wsgi').with(
:bind_port => 8999,
:group => 'vitrage',
@ -46,9 +43,6 @@ describe 'vitrage::wsgi::apache' do
}
end
it { is_expected.to contain_class('vitrage::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('vitrage_wsgi').with(
:bind_host => '10.42.51.1',
:bind_port => 12345,