openstack/puppet-openstacklib
Code Issues Proposed changes

Remove usage of apache::vhost::wsgi_daemon_process_options

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

73
manifests/wsgi/apache.pp
View File

@@ -329,43 +329,42 @@ define openstacklib::wsgi::apache (
# End of WSGIImportScript related options # End of WSGIImportScript related options
::apache::vhost { $service_name: ::apache::vhost { $service_name:
ensure => 'present', ensure => 'present',
servername => $servername, servername => $servername,
ip => $bind_host, ip => $bind_host,
port => $bind_port, port => $bind_port,
docroot => $wsgi_script_dir, docroot => $wsgi_script_dir,
docroot_owner => $user, docroot_owner => $user,
docroot_group => $group, docroot_group => $group,
priority => $priority, priority => $priority,
setenvif => ['X-Forwarded-Proto https HTTPS=1'], setenvif => ['X-Forwarded-Proto https HTTPS=1'],
ssl => $ssl, ssl => $ssl,
ssl_cert => $ssl_cert, ssl_cert => $ssl_cert,
ssl_key => $ssl_key, ssl_key => $ssl_key,
ssl_chain => $ssl_chain, ssl_chain => $ssl_chain,
ssl_ca => $ssl_ca, ssl_ca => $ssl_ca,
ssl_crl_path => $ssl_crl_path, ssl_crl_path => $ssl_crl_path,
ssl_crl => $ssl_crl, ssl_crl => $ssl_crl,
ssl_certs_dir => $ssl_certs_dir, ssl_certs_dir => $ssl_certs_dir,
wsgi_daemon_process => $wsgi_daemon_process, wsgi_daemon_process => hash([$wsgi_daemon_process, $wsgi_daemon_process_options]),
wsgi_daemon_process_options => $wsgi_daemon_process_options, wsgi_process_group => $wsgi_process_group,
wsgi_process_group => $wsgi_process_group, wsgi_script_aliases => $wsgi_script_aliases_real,
wsgi_script_aliases => $wsgi_script_aliases_real, wsgi_application_group => $wsgi_application_group,
wsgi_application_group => $wsgi_application_group, wsgi_pass_authorization => $wsgi_pass_authorization,
wsgi_pass_authorization => $wsgi_pass_authorization, wsgi_chunked_request => $wsgi_chunked_request,
wsgi_chunked_request => $wsgi_chunked_request, wsgi_import_script => $wsgi_import_script_real,
wsgi_import_script => $wsgi_import_script_real, wsgi_import_script_options => $wsgi_import_script_options_real,
wsgi_import_script_options => $wsgi_import_script_options_real, headers => $headers,
headers => $headers, custom_fragment => $vhost_custom_fragment,
custom_fragment => $vhost_custom_fragment, allow_encoded_slashes => $allow_encoded_slashes,
allow_encoded_slashes => $allow_encoded_slashes, access_log_file => $access_log_file,
access_log_file => $access_log_file, access_log_pipe => $access_log_pipe,
access_log_pipe => $access_log_pipe, access_log_syslog => $access_log_syslog,
access_log_syslog => $access_log_syslog, access_log_format => $access_log_format,
access_log_format => $access_log_format, error_log_file => $error_log_file,
error_log_file => $error_log_file, error_log_pipe => $error_log_pipe,
error_log_pipe => $error_log_pipe, error_log_syslog => $error_log_syslog,
error_log_syslog => $error_log_syslog, options => ['-Indexes', '+FollowSymLinks','+MultiViews'],
options => ['-Indexes', '+FollowSymLinks','+MultiViews'],
} }
Package<| title == 'httpd' |> Package<| title == 'httpd' |>

2
metadata.json
View File

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

49
spec/defines/openstacklib_wsgi_apache_spec.rb
View File

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