diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 30be0bc..6a78f89 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -128,11 +128,6 @@ class placement::wsgi::apache ( $ssl_real = pick($ssl, true) include placement::params - include apache - include apache::mod::wsgi - if $ssl_real { - include apache::mod::ssl - } if $ensure_package != undef { warning('The placement::wsgi::apache::ensure_package parameter is deprecated and has no effect') diff --git a/metadata.json b/metadata.json index f32b724..754f9bc 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 Placement.", diff --git a/spec/classes/placement_wsgi_apache.rb b/spec/classes/placement_wsgi_apache.rb index 6943e54..eee5ca4 100644 --- a/spec/classes/placement_wsgi_apache.rb +++ b/spec/classes/placement_wsgi_apache.rb @@ -5,9 +5,6 @@ describe 'placement::wsgi::apache' do context 'with default parameters' do it { should contain_class('placement::params') - should contain_class('apache') - should contain_class('apache::mod::wsgi') - should contain_class('apache::mod::ssl') } it { should contain_file(platform_params[:httpd_config_file]).with_ensure('present') } @@ -70,9 +67,6 @@ describe 'placement::wsgi::apache' do it { should contain_class('placement::params') - should contain_class('apache') - should contain_class('apache::mod::wsgi') - should_not contain_class('apache::mod::ssl') } it { should contain_file(platform_params[:httpd_config_file]).with_ensure('present') } @@ -125,14 +119,12 @@ describe 'placement::wsgi::apache' do case facts[:osfamily] when 'Debian' { - :package_name => 'placement-api', :httpd_config_file => '/etc/apache2/sites-available/nova-placement-api.conf', :wsgi_script_path => '/var/www/cgi-bin/placement', :wsgi_script_source => '/usr/bin/placement-api', } when 'RedHat' { - :package_name => 'openstack-placement-api', :httpd_config_file => '/etc/httpd/conf.d/00-placement-api.conf', :wsgi_script_path => '/var/www/cgi-bin/placement', :wsgi_script_source => '/usr/bin/placement-api',