openstack/puppet-octavia
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: I05e766017d22a4c637875f317abd7160f4cf69ac
This commit is contained in:
Takashi Kajinami 2021-12-08 22:39:08 +09:00
parent 64bfda831d
commit c1e08f0694
4 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/api.pp
View File

@ -132,7 +132,6 @@ class octavia::api (
tag => ['octavia-service', 'octavia-db-sync-service'],
}
} elsif $service_name == 'httpd' {
include apache::params
service { 'octavia-api':
ensure => 'stopped',
name => $::octavia::params::api_service_name,

6
manifests/wsgi/apache.pp
View File

@ -123,11 +123,7 @@ class octavia::wsgi::apache (
include octavia::deps
include octavia::params
include apache
include apache::mod::wsgi
if $ssl {
include apache::mod::ssl
}
::openstacklib::wsgi::apache { 'octavia_wsgi':
bind_host => $bind_host,
bind_port => $port,

4
metadata.json
View File

@ -1,10 +1,6 @@
{
"author": "OpenStack Contributors",
"dependencies": [
{
"name": "puppetlabs/apache",
"version_requirement": ">=5.0.0"
},
{
"name": "puppetlabs/inifile",
"version_requirement": ">=2.0.0 <6.0.0"

6
spec/classes/octavia_wsgi_apache_spec.rb
View File

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