openstack/puppet-placement
Code Issues Proposed changes

Merge "Clean up direct dependencies on puppetlabs-apache"

Browse Source
This commit is contained in:
Zuul 2021-12-13 17:52:26 +00:00 committed by Gerrit Code Review
commit 1f9583c805
3 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/wsgi/apache.pp
View File

@ -128,11 +128,6 @@ class placement::wsgi::apache (
$ssl_real = pick($ssl, true) $ssl_real = pick($ssl, true)
include placement::params include placement::params
include apache
include apache::mod::wsgi
if $ssl_real {
include apache::mod::ssl
}
if $ensure_package != undef { if $ensure_package != undef {
warning('The placement::wsgi::apache::ensure_package parameter is deprecated and has no effect') warning('The placement::wsgi::apache::ensure_package parameter is deprecated and has no effect')

4
metadata.json
View File

@ -20,10 +20,6 @@
{ {
"name": "openstack/oslo", "name": "openstack/oslo",
"version_requirement": ">=20.0.0 <21.0.0" "version_requirement": ">=20.0.0 <21.0.0"
},
{
"name": "puppetlabs/apache",
"version_requirement": ">=5.0.0"
} }
], ],
"description": "Installs and configures OpenStack Placement.", "description": "Installs and configures OpenStack Placement.",

8
spec/classes/placement_wsgi_apache.rb
View File

@ -5,9 +5,6 @@ describe 'placement::wsgi::apache' do
context 'with default parameters' do context 'with default parameters' do
it { it {
should contain_class('placement::params') 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') } it { should contain_file(platform_params[:httpd_config_file]).with_ensure('present') }
@ -70,9 +67,6 @@ describe 'placement::wsgi::apache' do
it { it {
should contain_class('placement::params') 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') } it { should contain_file(platform_params[:httpd_config_file]).with_ensure('present') }
@ -125,14 +119,12 @@ describe 'placement::wsgi::apache' do
case facts[:osfamily] case facts[:osfamily]
when 'Debian' when 'Debian'
{ {
:package_name => 'placement-api',
:httpd_config_file => '/etc/apache2/sites-available/nova-placement-api.conf', :httpd_config_file => '/etc/apache2/sites-available/nova-placement-api.conf',
:wsgi_script_path => '/var/www/cgi-bin/placement', :wsgi_script_path => '/var/www/cgi-bin/placement',
:wsgi_script_source => '/usr/bin/placement-api', :wsgi_script_source => '/usr/bin/placement-api',
} }
when 'RedHat' when 'RedHat'
{ {
:package_name => 'openstack-placement-api',
:httpd_config_file => '/etc/httpd/conf.d/00-placement-api.conf', :httpd_config_file => '/etc/httpd/conf.d/00-placement-api.conf',
:wsgi_script_path => '/var/www/cgi-bin/placement', :wsgi_script_path => '/var/www/cgi-bin/placement',
:wsgi_script_source => '/usr/bin/placement-api', :wsgi_script_source => '/usr/bin/placement-api',