Merge "Clean up direct dependencies on puppetlabs-apache"
This commit is contained in:
commit
c88f1b9a7d
|
@ -109,8 +109,6 @@ class gnocchi::api (
|
||||||
tag => ['gnocchi-service', 'gnocchi-db-sync-service'],
|
tag => ['gnocchi-service', 'gnocchi-db-sync-service'],
|
||||||
}
|
}
|
||||||
} elsif $service_name == 'httpd' {
|
} elsif $service_name == 'httpd' {
|
||||||
include apache::params
|
|
||||||
|
|
||||||
service { 'gnocchi-api':
|
service { 'gnocchi-api':
|
||||||
ensure => 'stopped',
|
ensure => 'stopped',
|
||||||
name => $::gnocchi::params::api_service_name,
|
name => $::gnocchi::params::api_service_name,
|
||||||
|
|
|
@ -136,11 +136,6 @@ class gnocchi::wsgi::apache (
|
||||||
|
|
||||||
include gnocchi::deps
|
include gnocchi::deps
|
||||||
include gnocchi::params
|
include gnocchi::params
|
||||||
include apache
|
|
||||||
include apache::mod::wsgi
|
|
||||||
if $ssl_real {
|
|
||||||
include apache::mod::ssl
|
|
||||||
}
|
|
||||||
|
|
||||||
::openstacklib::wsgi::apache { 'gnocchi_wsgi':
|
::openstacklib::wsgi::apache { 'gnocchi_wsgi':
|
||||||
bind_host => $bind_host,
|
bind_host => $bind_host,
|
||||||
|
|
|
@ -5,9 +5,6 @@ describe 'gnocchi::wsgi::apache' do
|
||||||
shared_examples_for 'apache serving gnocchi with mod_wsgi' do
|
shared_examples_for 'apache serving gnocchi with mod_wsgi' do
|
||||||
context 'with default parameters' do
|
context 'with default parameters' do
|
||||||
it { is_expected.to contain_class('gnocchi::params') }
|
it { is_expected.to contain_class('gnocchi::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('gnocchi_wsgi').with(
|
it { is_expected.to contain_openstacklib__wsgi__apache('gnocchi_wsgi').with(
|
||||||
:bind_port => 8041,
|
:bind_port => 8041,
|
||||||
:group => 'gnocchi',
|
:group => 'gnocchi',
|
||||||
|
@ -49,9 +46,6 @@ describe 'gnocchi::wsgi::apache' do
|
||||||
end
|
end
|
||||||
|
|
||||||
it { is_expected.to contain_class('gnocchi::params') }
|
it { is_expected.to contain_class('gnocchi::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('gnocchi_wsgi').with(
|
it { is_expected.to contain_openstacklib__wsgi__apache('gnocchi_wsgi').with(
|
||||||
:bind_host => '10.42.51.1',
|
:bind_host => '10.42.51.1',
|
||||||
:bind_port => 12345,
|
:bind_port => 12345,
|
||||||
|
@ -95,15 +89,11 @@ describe 'gnocchi::wsgi::apache' do
|
||||||
case facts[:osfamily]
|
case facts[:osfamily]
|
||||||
when 'Debian'
|
when 'Debian'
|
||||||
{
|
{
|
||||||
:httpd_service_name => 'apache2',
|
|
||||||
:httpd_ports_file => '/etc/apache2/ports.conf',
|
|
||||||
:wsgi_script_path => '/usr/lib/cgi-bin/gnocchi',
|
:wsgi_script_path => '/usr/lib/cgi-bin/gnocchi',
|
||||||
:wsgi_script_source => '/usr/bin/gnocchi-api'
|
:wsgi_script_source => '/usr/bin/gnocchi-api'
|
||||||
}
|
}
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
{
|
{
|
||||||
:httpd_service_name => 'httpd',
|
|
||||||
:httpd_ports_file => '/etc/httpd/conf/ports.conf',
|
|
||||||
:wsgi_script_path => '/var/www/cgi-bin/gnocchi',
|
:wsgi_script_path => '/var/www/cgi-bin/gnocchi',
|
||||||
:wsgi_script_source => '/usr/bin/gnocchi-api'
|
:wsgi_script_source => '/usr/bin/gnocchi-api'
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue