openstack/puppet-zaqar
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 server 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: I7f2f5dbb7f7e07be611da61905201d90baee28ef
This commit is contained in:
Takashi Kajinami 2021-12-08 22:52:54 +09:00
parent 768e1dc434
commit 1261e9ad08
4 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/server.pp
View File

@ -51,7 +51,6 @@ class zaqar::server(
} }
} elsif $service_name == 'httpd' { } elsif $service_name == 'httpd' {
include apache::params
service { $::zaqar::params::service_name: service { $::zaqar::params::service_name:
ensure => 'stopped', ensure => 'stopped',
name => $::zaqar::params::service_name, name => $::zaqar::params::service_name,

5
manifests/wsgi/apache.pp
View File

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

4
metadata.json
View File

@ -20,10 +20,6 @@
{ {
"name": "openstack/oslo", "name": "openstack/oslo",
"version_requirement": ">=20.0.0 <21.0.0" "version_requirement": ">=20.0.0 <21.0.0"
},
{
"name": "puppetlabs/apache",
"version_requirement": ">=5.0.0"
} }
], ],
"description": "Installs and configures OpenStack Zaqar.", "description": "Installs and configures OpenStack Zaqar.",

6
spec/classes/zaqar_wsgi_apache_spec.rb
View File

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