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: I05e766017d22a4c637875f317abd7160f4cf69ac
This commit is contained in:
@@ -132,7 +132,6 @@ class octavia::api (
|
|||||||
tag => ['octavia-service', 'octavia-db-sync-service'],
|
tag => ['octavia-service', 'octavia-db-sync-service'],
|
||||||
}
|
}
|
||||||
} elsif $service_name == 'httpd' {
|
} elsif $service_name == 'httpd' {
|
||||||
include apache::params
|
|
||||||
service { 'octavia-api':
|
service { 'octavia-api':
|
||||||
ensure => 'stopped',
|
ensure => 'stopped',
|
||||||
name => $::octavia::params::api_service_name,
|
name => $::octavia::params::api_service_name,
|
||||||
|
|||||||
@@ -123,11 +123,7 @@ class octavia::wsgi::apache (
|
|||||||
|
|
||||||
include octavia::deps
|
include octavia::deps
|
||||||
include octavia::params
|
include octavia::params
|
||||||
include apache
|
|
||||||
include apache::mod::wsgi
|
|
||||||
if $ssl {
|
|
||||||
include apache::mod::ssl
|
|
||||||
}
|
|
||||||
::openstacklib::wsgi::apache { 'octavia_wsgi':
|
::openstacklib::wsgi::apache { 'octavia_wsgi':
|
||||||
bind_host => $bind_host,
|
bind_host => $bind_host,
|
||||||
bind_port => $port,
|
bind_port => $port,
|
||||||
|
|||||||
@@ -1,10 +1,6 @@
|
|||||||
{
|
{
|
||||||
"author": "OpenStack Contributors",
|
"author": "OpenStack Contributors",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
{
|
|
||||||
"name": "puppetlabs/apache",
|
|
||||||
"version_requirement": ">=5.0.0"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "puppetlabs/inifile",
|
"name": "puppetlabs/inifile",
|
||||||
"version_requirement": ">=2.0.0 <6.0.0"
|
"version_requirement": ">=2.0.0 <6.0.0"
|
||||||
|
|||||||
@@ -5,9 +5,6 @@ describe 'octavia::wsgi::apache' do
|
|||||||
shared_examples_for 'apache serving octavia with mod_wsgi' do
|
shared_examples_for 'apache serving octavia with mod_wsgi' do
|
||||||
context 'with default parameters' do
|
context 'with default parameters' do
|
||||||
it { is_expected.to contain_class('octavia::params') }
|
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(
|
it { is_expected.to contain_openstacklib__wsgi__apache('octavia_wsgi').with(
|
||||||
:bind_port => 9876,
|
:bind_port => 9876,
|
||||||
:group => 'octavia',
|
:group => 'octavia',
|
||||||
@@ -47,9 +44,6 @@ describe 'octavia::wsgi::apache' do
|
|||||||
}
|
}
|
||||||
end
|
end
|
||||||
it { is_expected.to contain_class('octavia::params') }
|
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(
|
it { is_expected.to contain_openstacklib__wsgi__apache('octavia_wsgi').with(
|
||||||
:bind_host => '10.42.51.1',
|
:bind_host => '10.42.51.1',
|
||||||
:bind_port => 12345,
|
:bind_port => 12345,
|
||||||
|
|||||||
Reference in New Issue
Block a user