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: I110615c7cd4759e17a96c45d58402aba9216c05f
This commit is contained in:
parent
bfcbff3c8b
commit
3976a25fbb
|
@ -94,7 +94,6 @@ class cloudkitty::api (
|
|||
tag => 'cloudkitty-service',
|
||||
}
|
||||
} elsif $service_name == 'httpd' {
|
||||
include apache::params
|
||||
service { 'cloudkitty-api':
|
||||
ensure => 'stopped',
|
||||
name => $::cloudkitty::params::api_service_name,
|
||||
|
|
|
@ -126,11 +126,6 @@ class cloudkitty::wsgi::apache (
|
|||
|
||||
include cloudkitty::deps
|
||||
include cloudkitty::params
|
||||
include apache
|
||||
include apache::mod::wsgi
|
||||
if $ssl_real {
|
||||
include apache::mod::ssl
|
||||
}
|
||||
|
||||
::openstacklib::wsgi::apache { 'cloudkitty_wsgi':
|
||||
bind_host => $bind_host,
|
||||
|
|
|
@ -5,9 +5,6 @@ describe 'cloudkitty::wsgi::apache' do
|
|||
shared_examples_for 'apache serving cloudkitty with mod_wsgi' do
|
||||
context 'with default parameters' do
|
||||
it { is_expected.to contain_class('cloudkitty::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('cloudkitty_wsgi').with(
|
||||
:bind_port => 8889,
|
||||
:group => 'cloudkitty',
|
||||
|
@ -46,9 +43,6 @@ describe 'cloudkitty::wsgi::apache' do
|
|||
}
|
||||
end
|
||||
it { is_expected.to contain_class('cloudkitty::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('cloudkitty_wsgi').with(
|
||||
:bind_host => '10.42.51.1',
|
||||
:bind_port => 12345,
|
||||
|
|
Loading…
Reference in New Issue