openstack
/
puppet-openstacklib
Code Issues Proposed changes

Remove usage of apache::vhost::wsgi_daemon_process_options 

because apache::vhost::wsgi_daemon_process_options has been deprecated
in puppetlabs-apache[1].

[1] 0d5e0bef88

Change-Id: I0a233190d2a1c9d96128d99e1ac1a612161a7446
This commit is contained in:
Takashi Kajinami 2020-05-13 20:59:00 +09:00
parent 79c976c98e
commit 556f742e5e
4 changed files with 66 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/wsgi/apache.pp
View File

@ -346,8 +346,7 @@ define openstacklib::wsgi::apache (
ssl_crl_path => $ssl_crl_path,
ssl_crl => $ssl_crl,
ssl_certs_dir => $ssl_certs_dir,
wsgi_daemon_process => $wsgi_daemon_process,
wsgi_daemon_process_options => $wsgi_daemon_process_options,
wsgi_daemon_process => hash([$wsgi_daemon_process, $wsgi_daemon_process_options]),
wsgi_process_group => $wsgi_process_group,
wsgi_script_aliases => $wsgi_script_aliases_real,
wsgi_application_group => $wsgi_application_group,

2
metadata.json
View File

@ -3,7 +3,7 @@
"dependencies": [
{
"name": "puppetlabs/apache",
"version_requirement": ">=3.0.0"
"version_requirement": ">=5.0.0"
},
{
"name": "puppetlabs/inifile",

4
releasenotes/notes/apache-vhost-wsgi_daemon_process-3e90ea82934cbaea.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
This module now requires a puppetlabs-apache version >= 5.0.0

21
spec/defines/openstacklib_wsgi_apache_spec.rb
View File

@ -75,16 +75,16 @@ describe 'openstacklib::wsgi::apache' do
:docroot_owner => 'keystone',
:docroot_group => 'keystone',
:ssl => 'true',
:wsgi_daemon_process => 'keystone_wsgi',
:wsgi_process_group => 'keystone_wsgi',
:wsgi_script_aliases => { '/' => "/var/www/cgi-bin/keystone/main" },
:wsgi_daemon_process_options => {
:wsgi_daemon_process => {
'keystone_wsgi' => {
'user' => 'keystone',
'group' => 'keystone',
'processes' => global_facts[:os_workers],
'threads' => 1,
'display-name' => 'keystone_wsgi',
},
}},
:wsgi_process_group => 'keystone_wsgi',
:wsgi_script_aliases => { '/' => "/var/www/cgi-bin/keystone/main" },
:wsgi_application_group => '%{GLOBAL}',
:headers => nil,
:setenvif => ['X-Forwarded-Proto https HTTPS=1'],
@ -134,14 +134,14 @@ describe 'openstacklib::wsgi::apache' do
:port => '4142',
:docroot => "/var/www/cgi-bin/keystone",
:ssl => 'false',
:wsgi_daemon_process => 'keystone_wsgi',
:wsgi_daemon_process_options => {
:wsgi_daemon_process => {
'keystone_wsgi' => {
'user' => 'keystone',
'group' => 'keystone',
'processes' => '37',
'threads' => '1',
'display-name' => 'keystone_wsgi',
},
}},
:wsgi_process_group => 'keystone_wsgi',
:wsgi_script_aliases => {
'/' => '/var/www/cgi-bin/keystone/main',
@ -180,14 +180,15 @@ describe 'openstacklib::wsgi::apache' do
end
it { should contain_apache__vhost('keystone_wsgi').with(
:wsgi_daemon_process_options => {
:wsgi_daemon_process => {
'keystone_wsgi' => {
'user' => 'someotheruser',
'group' => 'someothergroup',
'processes' => global_facts[:os_workers],
'threads' => 1,
'display-name' => 'keystone_wsgi',
'python_path' => '/my/python/admin/path',
},
}},
)}
end