Use the pbr generated wsgi binary file located in binary folder
Since pbr 1.4.0, wsgi_scripts entrypoing is supported and it will generated a wsgi compatible binary file. Change-Id: Ifaf069874a53fedabd252e55f5f20a9f66ba0756
This commit is contained in:
parent
c8d3dd2218
commit
8871a9e82f
|
@ -17,7 +17,7 @@ class cloudkitty::params {
|
|||
$processor_package_name = 'openstack-cloudkitty-processor'
|
||||
$ui_package_name = 'openstack-cloudkitty-ui'
|
||||
$common_package_name = 'openstack-cloudkitty-common'
|
||||
$cloudkitty_wsgi_script_source = '/usr/lib/python2.7/site-packages/cloudkitty/api/app.wsgi'
|
||||
$cloudkitty_wsgi_script_source = '/usr/bin/cloudkitty-api'
|
||||
$cloudkitty_wsgi_script_path = '/var/www/cgi-bin/cloudkitty'
|
||||
}
|
||||
'Debian': {
|
||||
|
@ -26,7 +26,7 @@ class cloudkitty::params {
|
|||
$processor_package_name = 'cloudkitty-processor'
|
||||
$ui_package_name = 'cloudkitty-dashboard'
|
||||
$common_package_name = 'cloudkitty-common'
|
||||
$cloudkitty_wsgi_script_source = '/usr/lib/python2.7/dist-packages/cloudkitty/api/app.wsgi'
|
||||
$cloudkitty_wsgi_script_source = '/usr/bin/cloudkitty-api'
|
||||
$cloudkitty_wsgi_script_path = '/usr/lib/cgi-bin/cloudkitty'
|
||||
}
|
||||
default: {
|
||||
|
|
|
@ -21,7 +21,7 @@ describe 'cloudkitty::wsgi::apache' do
|
|||
:wsgi_process_group => 'cloudkitty',
|
||||
:wsgi_script_dir => platform_params[:wsgi_script_path],
|
||||
:wsgi_script_file => 'app',
|
||||
:wsgi_script_source => platform_params[:wsgi_script_source],
|
||||
:wsgi_script_source => '/usr/bin/cloudkitty-api',
|
||||
:custom_wsgi_process_options => {},
|
||||
:access_log_file => false,
|
||||
:access_log_format => false,
|
||||
|
@ -64,7 +64,7 @@ describe 'cloudkitty::wsgi::apache' do
|
|||
:wsgi_process_group => 'cloudkitty',
|
||||
:wsgi_script_dir => platform_params[:wsgi_script_path],
|
||||
:wsgi_script_file => 'app',
|
||||
:wsgi_script_source => platform_params[:wsgi_script_source],
|
||||
:wsgi_script_source => '/usr/bin/cloudkitty-api',
|
||||
:custom_wsgi_process_options => {
|
||||
'python_path' => '/my/python/admin/path',
|
||||
},
|
||||
|
@ -92,12 +92,10 @@ describe 'cloudkitty::wsgi::apache' do
|
|||
when 'Debian'
|
||||
{
|
||||
:wsgi_script_path => '/usr/lib/cgi-bin/cloudkitty',
|
||||
:wsgi_script_source => '/usr/lib/python2.7/dist-packages/cloudkitty/api/app.wsgi'
|
||||
}
|
||||
when 'RedHat'
|
||||
{
|
||||
:wsgi_script_path => '/var/www/cgi-bin/cloudkitty',
|
||||
:wsgi_script_source => '/usr/lib/python2.7/site-packages/cloudkitty/api/app.wsgi'
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue