diff --git a/manifests/api.pp b/manifests/api.pp index f7ae8eac..de284095 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -109,8 +109,6 @@ class gnocchi::api ( tag => ['gnocchi-service', 'gnocchi-db-sync-service'], } } elsif $service_name == 'httpd' { - include apache::params - service { 'gnocchi-api': ensure => 'stopped', name => $::gnocchi::params::api_service_name, diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 0954d5e5..58e52dd8 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -136,11 +136,6 @@ class gnocchi::wsgi::apache ( include gnocchi::deps include gnocchi::params - include apache - include apache::mod::wsgi - if $ssl_real { - include apache::mod::ssl - } ::openstacklib::wsgi::apache { 'gnocchi_wsgi': bind_host => $bind_host, diff --git a/spec/classes/gnocchi_wsgi_apache_spec.rb b/spec/classes/gnocchi_wsgi_apache_spec.rb index c1c5162b..16293cc4 100644 --- a/spec/classes/gnocchi_wsgi_apache_spec.rb +++ b/spec/classes/gnocchi_wsgi_apache_spec.rb @@ -5,9 +5,6 @@ describe 'gnocchi::wsgi::apache' do shared_examples_for 'apache serving gnocchi with mod_wsgi' do context 'with default parameters' do 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( :bind_port => 8041, :group => 'gnocchi', @@ -49,9 +46,6 @@ describe 'gnocchi::wsgi::apache' do end 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( :bind_host => '10.42.51.1', :bind_port => 12345, @@ -95,15 +89,11 @@ describe 'gnocchi::wsgi::apache' do case facts[:osfamily] when 'Debian' { - :httpd_service_name => 'apache2', - :httpd_ports_file => '/etc/apache2/ports.conf', :wsgi_script_path => '/usr/lib/cgi-bin/gnocchi', :wsgi_script_source => '/usr/bin/gnocchi-api' } when 'RedHat' { - :httpd_service_name => 'httpd', - :httpd_ports_file => '/etc/httpd/conf/ports.conf', :wsgi_script_path => '/var/www/cgi-bin/gnocchi', :wsgi_script_source => '/usr/bin/gnocchi-api' }