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
parent
79c976c98e
commit
556f742e5e
@ -329,43 +329,42 @@ define openstacklib::wsgi::apache (
|
||||
# End of WSGIImportScript related options
|
||||
|
||||
::apache::vhost { $service_name:
|
||||
ensure => 'present',
|
||||
servername => $servername,
|
||||
ip => $bind_host,
|
||||
port => $bind_port,
|
||||
docroot => $wsgi_script_dir,
|
||||
docroot_owner => $user,
|
||||
docroot_group => $group,
|
||||
priority => $priority,
|
||||
setenvif => ['X-Forwarded-Proto https HTTPS=1'],
|
||||
ssl => $ssl,
|
||||
ssl_cert => $ssl_cert,
|
||||
ssl_key => $ssl_key,
|
||||
ssl_chain => $ssl_chain,
|
||||
ssl_ca => $ssl_ca,
|
||||
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_process_group => $wsgi_process_group,
|
||||
wsgi_script_aliases => $wsgi_script_aliases_real,
|
||||
wsgi_application_group => $wsgi_application_group,
|
||||
wsgi_pass_authorization => $wsgi_pass_authorization,
|
||||
wsgi_chunked_request => $wsgi_chunked_request,
|
||||
wsgi_import_script => $wsgi_import_script_real,
|
||||
wsgi_import_script_options => $wsgi_import_script_options_real,
|
||||
headers => $headers,
|
||||
custom_fragment => $vhost_custom_fragment,
|
||||
allow_encoded_slashes => $allow_encoded_slashes,
|
||||
access_log_file => $access_log_file,
|
||||
access_log_pipe => $access_log_pipe,
|
||||
access_log_syslog => $access_log_syslog,
|
||||
access_log_format => $access_log_format,
|
||||
error_log_file => $error_log_file,
|
||||
error_log_pipe => $error_log_pipe,
|
||||
error_log_syslog => $error_log_syslog,
|
||||
options => ['-Indexes', '+FollowSymLinks','+MultiViews'],
|
||||
ensure => 'present',
|
||||
servername => $servername,
|
||||
ip => $bind_host,
|
||||
port => $bind_port,
|
||||
docroot => $wsgi_script_dir,
|
||||
docroot_owner => $user,
|
||||
docroot_group => $group,
|
||||
priority => $priority,
|
||||
setenvif => ['X-Forwarded-Proto https HTTPS=1'],
|
||||
ssl => $ssl,
|
||||
ssl_cert => $ssl_cert,
|
||||
ssl_key => $ssl_key,
|
||||
ssl_chain => $ssl_chain,
|
||||
ssl_ca => $ssl_ca,
|
||||
ssl_crl_path => $ssl_crl_path,
|
||||
ssl_crl => $ssl_crl,
|
||||
ssl_certs_dir => $ssl_certs_dir,
|
||||
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,
|
||||
wsgi_pass_authorization => $wsgi_pass_authorization,
|
||||
wsgi_chunked_request => $wsgi_chunked_request,
|
||||
wsgi_import_script => $wsgi_import_script_real,
|
||||
wsgi_import_script_options => $wsgi_import_script_options_real,
|
||||
headers => $headers,
|
||||
custom_fragment => $vhost_custom_fragment,
|
||||
allow_encoded_slashes => $allow_encoded_slashes,
|
||||
access_log_file => $access_log_file,
|
||||
access_log_pipe => $access_log_pipe,
|
||||
access_log_syslog => $access_log_syslog,
|
||||
access_log_format => $access_log_format,
|
||||
error_log_file => $error_log_file,
|
||||
error_log_pipe => $error_log_pipe,
|
||||
error_log_syslog => $error_log_syslog,
|
||||
options => ['-Indexes', '+FollowSymLinks','+MultiViews'],
|
||||
}
|
||||
|
||||
Package<| title == 'httpd' |>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "puppetlabs/apache",
|
||||
"version_requirement": ">=3.0.0"
|
||||
"version_requirement": ">=5.0.0"
|
||||
},
|
||||
{
|
||||
"name": "puppetlabs/inifile",
|
||||
|
||||
@ -0,0 +1,4 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
This module now requires a puppetlabs-apache version >= 5.0.0
|
||||
@ -75,16 +75,16 @@ describe 'openstacklib::wsgi::apache' do
|
||||
:docroot_owner => 'keystone',
|
||||
:docroot_group => 'keystone',
|
||||
: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_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}',
|
||||
: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 => {
|
||||
'user' => 'keystone',
|
||||
'group' => 'keystone',
|
||||
'processes' => '37',
|
||||
'threads' => '1',
|
||||
'display-name' => 'keystone_wsgi',
|
||||
},
|
||||
: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 => {
|
||||
'user' => 'someotheruser',
|
||||
'group' => 'someothergroup',
|
||||
'processes' => global_facts[:os_workers],
|
||||
'threads' => 1,
|
||||
'display-name' => 'keystone_wsgi',
|
||||
'python_path' => '/my/python/admin/path',
|
||||
},
|
||||
: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
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user