diff --git a/manifests/wsgi/apache_api.pp b/manifests/wsgi/apache_api.pp index 19832dc52..3cf0460fd 100644 --- a/manifests/wsgi/apache_api.pp +++ b/manifests/wsgi/apache_api.pp @@ -135,11 +135,6 @@ class nova::wsgi::apache_api ( $ssl_real = pick($ssl, true) include nova::params - include apache - include apache::mod::wsgi - if $ssl_real { - include apache::mod::ssl - } if ! defined(Class[nova::api]) { fail('::nova::api class must be declared in composition layer.') diff --git a/manifests/wsgi/apache_metadata.pp b/manifests/wsgi/apache_metadata.pp index cbb976900..c55bacc5f 100644 --- a/manifests/wsgi/apache_metadata.pp +++ b/manifests/wsgi/apache_metadata.pp @@ -122,11 +122,6 @@ class nova::wsgi::apache_metadata ( $ssl_real = pick($ssl, true) include nova::params - include apache - include apache::mod::wsgi - if $ssl_real { - include apache::mod::ssl - } nova::generic_service { 'metadata-api': service_name => false, diff --git a/metadata.json b/metadata.json index cf1c816c7..18ce43700 100644 --- a/metadata.json +++ b/metadata.json @@ -1,10 +1,6 @@ { "author": "Puppet Labs and OpenStack Contributors", "dependencies": [ - { - "name": "puppetlabs/apache", - "version_requirement": ">=5.0.0" - }, { "name": "joshuabaird/ipaclient", "version_requirement": ">=2.5.1" diff --git a/spec/classes/nova_wsgi_apache_api_spec.rb b/spec/classes/nova_wsgi_apache_api_spec.rb index 3361b335e..d6189107b 100644 --- a/spec/classes/nova_wsgi_apache_api_spec.rb +++ b/spec/classes/nova_wsgi_apache_api_spec.rb @@ -14,9 +14,6 @@ describe 'nova::wsgi::apache_api' do }" end it { is_expected.to contain_class('nova::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('nova_api_wsgi').with( :bind_port => 8774, :group => 'nova', @@ -68,9 +65,6 @@ describe 'nova::wsgi::apache_api' do end it { is_expected.to contain_class('nova::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('nova_api_wsgi').with( :bind_host => '10.42.51.1', :bind_port => 12345, diff --git a/spec/classes/nova_wsgi_apache_metadata_spec.rb b/spec/classes/nova_wsgi_apache_metadata_spec.rb index 3e334cf74..ec8990e89 100644 --- a/spec/classes/nova_wsgi_apache_metadata_spec.rb +++ b/spec/classes/nova_wsgi_apache_metadata_spec.rb @@ -12,9 +12,6 @@ describe 'nova::wsgi::apache_metadata' do class { 'nova::metadata': }" end it { is_expected.to contain_class('nova::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('nova_metadata_wsgi').with( :bind_port => 8775, :group => 'nova', @@ -64,9 +61,6 @@ describe 'nova::wsgi::apache_metadata' do end it { is_expected.to contain_class('nova::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('nova_metadata_wsgi').with( :bind_host => '10.42.51.1', :bind_port => 12345,