Move mistral wsgi source to generated script
Use a pbr-generated script for the wsgi script. Also, set the defaults for the threads and workers to sane values. Change-Id: I61199f53d7e32fcb3d068ccaf548a836b5bb58e9 Depends-On: I953dbdab71029b392f8846c50fa3d801c293cc5a
This commit is contained in:
parent
68eb72297a
commit
055a25e802
|
@ -19,7 +19,7 @@ class mistral::params {
|
||||||
$executor_package_name = 'openstack-mistral-executor'
|
$executor_package_name = 'openstack-mistral-executor'
|
||||||
$executor_service_name = 'openstack-mistral-executor'
|
$executor_service_name = 'openstack-mistral-executor'
|
||||||
$mistral_wsgi_script_path = '/var/www/cgi-bin/mistral'
|
$mistral_wsgi_script_path = '/var/www/cgi-bin/mistral'
|
||||||
$mistral_wsgi_script_source = '/usr/lib/python2.7/site-packages/mistral/api/wsgi.py'
|
$mistral_wsgi_script_source = '/usr/bin/mistral-wsgi-api'
|
||||||
}
|
}
|
||||||
'Debian': {
|
'Debian': {
|
||||||
$common_package_name = 'mistral-common'
|
$common_package_name = 'mistral-common'
|
||||||
|
@ -30,7 +30,7 @@ class mistral::params {
|
||||||
$executor_package_name = 'mistral-executor'
|
$executor_package_name = 'mistral-executor'
|
||||||
$executor_service_name = 'mistral-executor'
|
$executor_service_name = 'mistral-executor'
|
||||||
$mistral_wsgi_script_path = '/usr/lib/cgi-bin/mistral'
|
$mistral_wsgi_script_path = '/usr/lib/cgi-bin/mistral'
|
||||||
$mistral_wsgi_script_source = '/usr/lib/python2.7/dist-packages/mistral/api/wsgi.py'
|
$mistral_wsgi_script_source = '/usr/bin/mistral-wsgi-api'
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
fail("Unsupported osfamily: ${::osfamily} operatingsystem: \
|
fail("Unsupported osfamily: ${::osfamily} operatingsystem: \
|
||||||
|
|
|
@ -86,7 +86,7 @@ class mistral::wsgi::apache (
|
||||||
$bind_host = undef,
|
$bind_host = undef,
|
||||||
$path = '/',
|
$path = '/',
|
||||||
$ssl = true,
|
$ssl = true,
|
||||||
$workers = 1,
|
$workers = $::os_workers,
|
||||||
$ssl_cert = undef,
|
$ssl_cert = undef,
|
||||||
$ssl_key = undef,
|
$ssl_key = undef,
|
||||||
$ssl_chain = undef,
|
$ssl_chain = undef,
|
||||||
|
@ -95,7 +95,7 @@ class mistral::wsgi::apache (
|
||||||
$ssl_crl = undef,
|
$ssl_crl = undef,
|
||||||
$ssl_certs_dir = undef,
|
$ssl_certs_dir = undef,
|
||||||
$wsgi_process_display_name = undef,
|
$wsgi_process_display_name = undef,
|
||||||
$threads = $::os_workers,
|
$threads = 1,
|
||||||
$priority = '10',
|
$priority = '10',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
|
|
|
@ -41,8 +41,8 @@ describe 'mistral::wsgi::apache' do
|
||||||
'wsgi_daemon_process_options' => {
|
'wsgi_daemon_process_options' => {
|
||||||
'user' => 'mistral',
|
'user' => 'mistral',
|
||||||
'group' => 'mistral',
|
'group' => 'mistral',
|
||||||
'processes' => 1,
|
'processes' => '8',
|
||||||
'threads' => '8',
|
'threads' => '1',
|
||||||
'display-name' => 'mistral_wsgi',
|
'display-name' => 'mistral_wsgi',
|
||||||
},
|
},
|
||||||
'wsgi_process_group' => 'mistral',
|
'wsgi_process_group' => 'mistral',
|
||||||
|
@ -77,7 +77,7 @@ describe 'mistral::wsgi::apache' do
|
||||||
'user' => 'mistral',
|
'user' => 'mistral',
|
||||||
'group' => 'mistral',
|
'group' => 'mistral',
|
||||||
'processes' => '37',
|
'processes' => '37',
|
||||||
'threads' => '8',
|
'threads' => '1',
|
||||||
'display-name' => 'mistral',
|
'display-name' => 'mistral',
|
||||||
},
|
},
|
||||||
'wsgi_process_group' => 'mistral',
|
'wsgi_process_group' => 'mistral',
|
||||||
|
@ -108,14 +108,14 @@ describe 'mistral::wsgi::apache' do
|
||||||
:httpd_service_name => 'apache2',
|
:httpd_service_name => 'apache2',
|
||||||
:httpd_ports_file => '/etc/apache2/ports.conf',
|
:httpd_ports_file => '/etc/apache2/ports.conf',
|
||||||
:wsgi_script_path => '/usr/lib/cgi-bin/mistral',
|
:wsgi_script_path => '/usr/lib/cgi-bin/mistral',
|
||||||
:wsgi_script_source => '/usr/lib/python2.7/dist-packages/mistral/api/wsgi.py'
|
:wsgi_script_source => '/usr/bin/mistral-wsgi-api'
|
||||||
}
|
}
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
{
|
{
|
||||||
:httpd_service_name => 'httpd',
|
:httpd_service_name => 'httpd',
|
||||||
:httpd_ports_file => '/etc/httpd/conf/ports.conf',
|
:httpd_ports_file => '/etc/httpd/conf/ports.conf',
|
||||||
:wsgi_script_path => '/var/www/cgi-bin/mistral',
|
:wsgi_script_path => '/var/www/cgi-bin/mistral',
|
||||||
:wsgi_script_source => '/usr/lib/python2.7/site-packages/mistral/api/wsgi.py'
|
:wsgi_script_source => '/usr/bin/mistral-wsgi-api'
|
||||||
}
|
}
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue