openstack
/
puppet-glance
Code Issues Proposed changes

Remove redundant class inclusion 

The apache class is already included by the openstacklib::wsgi::apache
defined types and the apache::wsgi class and the apache::ssl class is
automatically included by the apache::vhost defined type.

This removes the redundant inclusion of these classes.

Change-Id: If132d46ec1929ed56e16a9b615010ea0535282ba
This commit is contained in:
Takashi Kajinami 2022-08-27 12:33:01 +09:00
parent 33f273f416
commit ab56cfb33a
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/wsgi/apache.pp
View File

@ -154,11 +154,6 @@ class glance::wsgi::apache (
include glance::deps
include glance::params
include apache
include apache::mod::wsgi
if $ssl {
include apache::mod::ssl
}
::openstacklib::wsgi::apache { 'glance_wsgi':
bind_host => $bind_host,

6
spec/classes/glance_wsgi_apache_spec.rb
View File

@ -4,9 +4,6 @@ describe 'glance::wsgi::apache' do
shared_examples 'apache serving glance with mod_wsgi' do
context 'with default parameters' do
it { is_expected.to contain_class('glance::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('glance_wsgi').with(
:bind_port => 9292,
:group => 'glance',
@ -54,9 +51,6 @@ describe 'glance::wsgi::apache' do
}
end
it { is_expected.to contain_class('glance::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('glance_wsgi').with(
:bind_host => '10.42.51.1',
:bind_port => 12345,