openstack/puppet-ironic
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: Id1681b09ab370d197ac4690ff3d27a6824325a2b
This commit is contained in:
Takashi Kajinami 2021-12-08 22:21:42 +09:00
parent a57504784c
commit e5679fa003
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

@ -122,7 +122,6 @@ class ironic::api (
}
Keystone_endpoint<||> -> Service['ironic-api']
} elsif $service_name == 'httpd' {
include apache::params
service { 'ironic-api':
ensure => 'stopped',
name => $::ironic::params::api_service,

5
manifests/wsgi/apache.pp
View File

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

6
spec/classes/ironic_wsgi_apache_spec.rb
View File

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