diff --git a/manifests/api.pp b/manifests/api.pp index 3cb168f2..95949aad 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -199,7 +199,6 @@ Use cinder::nova::region_name instead') } } elsif $service_name == 'httpd' { - include apache::params service { 'cinder-api': ensure => 'stopped', name => $::cinder::params::api_service, diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 52d1dbfc..49d4391f 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -152,11 +152,6 @@ class cinder::wsgi::apache ( include cinder::deps include cinder::params - include apache - include apache::mod::wsgi - if $ssl_real { - include apache::mod::ssl - } ::openstacklib::wsgi::apache { 'cinder_wsgi': bind_host => $bind_host, diff --git a/metadata.json b/metadata.json index 12401076..f7d5e9e0 100644 --- a/metadata.json +++ b/metadata.json @@ -20,10 +20,6 @@ { "name": "openstack/oslo", "version_requirement": ">=20.0.0 <21.0.0" - }, - { - "name": "puppetlabs/apache", - "version_requirement": ">=5.0.0" } ], "description": "Installs and configures OpenStack Cinder (Block Storage).", diff --git a/spec/classes/cinder_wsgi_apache_spec.rb b/spec/classes/cinder_wsgi_apache_spec.rb index 1d4a7d06..2c381031 100644 --- a/spec/classes/cinder_wsgi_apache_spec.rb +++ b/spec/classes/cinder_wsgi_apache_spec.rb @@ -4,9 +4,6 @@ describe 'cinder::wsgi::apache' do shared_examples 'apache serving cinder with mod_wsgi' do context 'with default parameters' do it { is_expected.to contain_class('cinder::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('cinder_wsgi').with( :bind_port => 8776, :group => 'cinder', @@ -48,9 +45,6 @@ describe 'cinder::wsgi::apache' do } end it { is_expected.to contain_class('cinder::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('cinder_wsgi').with( :bind_host => '10.42.51.1', :bind_port => 12345, @@ -155,15 +149,11 @@ describe 'cinder::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/cinder', :wsgi_script_source => '/usr/bin/cinder-wsgi' } when 'RedHat' { - :httpd_service_name => 'httpd', - :httpd_ports_file => '/etc/httpd/conf/ports.conf', :wsgi_script_path => '/var/www/cgi-bin/cinder', :wsgi_script_source => '/usr/bin/cinder-wsgi' }