openstack/puppet-horizon
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: Ia82ddb325fb9bd610186cdd57ac69c27beead214
This commit is contained in:
Takashi Kajinami 2020-05-13 20:50:44 +09:00
parent b471f12fbe
commit 6d48ba09e6
4 changed files with 50 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/wsgi/apache.pp
View File

@ -237,8 +237,6 @@ class horizon::wsgi::apache (
ssl_key => $horizon_key,
ssl_ca => $horizon_ca,
wsgi_script_aliases => hash([$script_url, $::horizon::params::django_wsgi]),
wsgi_daemon_process => $::horizon::params::wsgi_group,
wsgi_daemon_process_options => $wsgi_daemon_process_options,
wsgi_import_script => $::horizon::params::django_wsgi,
wsgi_process_group => $::horizon::params::wsgi_group,
wsgi_application_group => $::horizon::params::wsgi_application_group,
@ -266,18 +264,21 @@ class horizon::wsgi::apache (
}
ensure_resource('apache::vhost', $vhost_conf_name, merge ($default_vhost_conf, $extra_params, {
wsgi_daemon_process => hash([$::horizon::params::wsgi_group, $wsgi_daemon_process_options])
}, {
redirectmatch_regexp => $redirectmatch_regexp_real,
redirectmatch_dest => $redirectmatch_url_real,
options => ['-Indexes', '+FollowSymLinks','+MultiViews'],
}))
ensure_resource('apache::vhost', $vhost_ssl_conf_name, merge ($default_vhost_conf, $extra_params, {
wsgi_daemon_process => hash(['horizon-ssl', $wsgi_daemon_process_options]),
}, {
access_log_file => 'horizon_ssl_access.log',
error_log_file => 'horizon_ssl_error.log',
priority => $priority,
ssl => true,
port => $https_port,
ensure => $ensure_ssl_vhost,
wsgi_daemon_process => 'horizon-ssl',
wsgi_process_group => 'horizon-ssl',
redirectmatch_regexp => $root_url_real ? { '' => undef, '/' => undef, default => '^/$' },
redirectmatch_dest => $root_url_real ? { '' => undef, '/' => undef, default => $root_url_real },

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/stdlib",

4
releasenotes/notes/apache-vhost-wsgi_daemon_process-37b8be9a679e31d0.yaml Normal file
View File

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

67
spec/classes/horizon_wsgi_apache_spec.rb
View File

@ -42,15 +42,15 @@ describe 'horizon::wsgi::apache' do
:redirectmatch_dest => platforms_params[:root_url],
:wsgi_script_aliases => { platforms_params[:root_url] => '/usr/share/openstack-dashboard/openstack_dashboard/wsgi.py' },
:wsgi_process_group => platforms_params[:wsgi_group],
:wsgi_daemon_process => platforms_params[:wsgi_group],
:wsgi_daemon_process => {
platforms_params[:wsgi_group] => {
'processes' => facts[:os_workers],
'threads' => '1',
'user' => platforms_params[:unix_user],
'group' => platforms_params[:unix_group],
'display-name' => 'horizon'
}},
:wsgi_application_group => '%{GLOBAL}',
:wsgi_daemon_process_options => {
'processes' => facts[:os_workers],
'threads' => '1',
'user' => platforms_params[:unix_user],
'group' => platforms_params[:unix_group],
'display-name' => 'horizon'
}
)}
end
@ -88,15 +88,15 @@ describe 'horizon::wsgi::apache' do
:redirectmatch_dest => platforms_params[:root_url],
:wsgi_script_aliases => { platforms_params[:root_url] => '/usr/share/openstack-dashboard/openstack_dashboard/wsgi.py' },
:wsgi_process_group => platforms_params[:wsgi_group],
:wsgi_daemon_process => platforms_params[:wsgi_group],
:wsgi_daemon_process => {
platforms_params[:wsgi_group] => {
'processes' => '13',
'threads' => '3',
'user' => platforms_params[:unix_user],
'group' => platforms_params[:unix_group],
'display-name' => 'horizon'
}},
:wsgi_application_group => '%{GLOBAL}',
:wsgi_daemon_process_options => {
'processes' => '13',
'threads' => '3',
'user' => platforms_params[:unix_user],
'group' => platforms_params[:unix_group],
'display-name' => 'horizon'
}
)}
end
@ -111,14 +111,15 @@ describe 'horizon::wsgi::apache' do
end
it { should contain_apache__vhost('horizon_vhost').with(
:wsgi_daemon_process_options => {
'processes' => facts[:os_workers],
'threads' => '1',
'user' => 'myuser',
'group' => platforms_params[:unix_group],
'display-name' => 'horizon',
'python_path' => '/my/python/admin/path'
}
:wsgi_daemon_process => {
platforms_params[:wsgi_group] => {
'processes' => facts[:os_workers],
'threads' => '1',
'user' => 'myuser',
'group' => platforms_params[:unix_group],
'display-name' => 'horizon',
'python_path' => '/my/python/admin/path'
}}
)}
end
@ -152,7 +153,14 @@ describe 'horizon::wsgi::apache' do
:redirectmatch_regexp => '^/$',
:redirectmatch_dest => platforms_params[:root_url],
:wsgi_process_group => 'horizon-ssl',
:wsgi_daemon_process => 'horizon-ssl',
:wsgi_daemon_process => {
'horizon-ssl' => {
'processes' => facts[:os_workers],
'threads' => '1',
'user' => platforms_params[:unix_user],
'group' => platforms_params[:unix_group],
'display-name' => 'horizon'
}},
:wsgi_application_group => '%{GLOBAL}',
:wsgi_script_aliases => {
platforms_params[:root_url] => '/usr/share/openstack-dashboard/openstack_dashboard/wsgi.py'
@ -173,7 +181,14 @@ describe 'horizon::wsgi::apache' do
:redirectmatch_regexp => '(.*)',
:redirectmatch_dest => 'https://some.host.tld',
:wsgi_process_group => platforms_params[:wsgi_group],
:wsgi_daemon_process => platforms_params[:wsgi_group],
:wsgi_daemon_process => {
platforms_params[:wsgi_group] => {
'processes' => facts[:os_workers],
'threads' => '1',
'user' => platforms_params[:unix_user],
'group' => platforms_params[:unix_group],
'display-name' => 'horizon'
}},
:wsgi_application_group => '%{GLOBAL}',
:wsgi_script_aliases => {
platforms_params[:root_url] => '/usr/share/openstack-dashboard/openstack_dashboard/wsgi.py'