openstack/puppet-panko
Code Issues Proposed changes

Use the pbr generated wsgi binary file located in binary folder

Browse Source 
Since pbr 1.4.0, wsgi_scripts entrypoing is supported and it will
generated a wsgi compatible binary file.

Change-Id: I7f3a73832900bce5affae4c6b2cfe503be80a616
This commit is contained in:
ZhongShengping 2018-03-26 14:55:24 +08:00
parent 16423a0188
commit 2fb99be317
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/params.pp
View File

@ -12,14 +12,14 @@ class panko::params {
$api_package_name = 'openstack-panko-api'
$api_service_name = 'openstack-panko-api'
$panko_wsgi_script_path = '/var/www/cgi-bin/panko'
$panko_wsgi_script_source = '/usr/lib/python2.7/site-packages/panko/api/app.wsgi'
$panko_wsgi_script_source = '/usr/bin/panko-api'
}
'Debian': {
$common_package_name = 'panko-common'
$api_package_name = 'panko-api'
$api_service_name = 'panko-api'
$panko_wsgi_script_path = '/usr/lib/cgi-bin/panko'
$panko_wsgi_script_source = '/usr/lib/python2.7/dist-packages/panko/api/app.wsgi'
$panko_wsgi_script_source = '/usr/bin/panko-api'
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem")

6
spec/classes/panko_wsgi_apache_spec.rb
View File

@ -21,7 +21,7 @@ describe 'panko::wsgi::apache' do
:wsgi_process_group => 'panko',
: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/panko-api',
:access_log_file => false,
:access_log_format => false,
)}
@ -63,7 +63,7 @@ describe 'panko::wsgi::apache' do
:wsgi_process_group => 'panko',
: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/panko-api',
:custom_wsgi_process_options => {
'python_path' => '/my/python/admin/path',
},
@ -93,14 +93,12 @@ describe 'panko::wsgi::apache' do
:httpd_service_name => 'apache2',
:httpd_ports_file => '/etc/apache2/ports.conf',
:wsgi_script_path => '/usr/lib/cgi-bin/panko',
:wsgi_script_source => '/usr/lib/python2.7/dist-packages/panko/api/app.wsgi'
}
when 'RedHat'
{
:httpd_service_name => 'httpd',
:httpd_ports_file => '/etc/httpd/conf/ports.conf',
:wsgi_script_path => '/var/www/cgi-bin/panko',
:wsgi_script_source => '/usr/lib/python2.7/site-packages/panko/api/app.wsgi'
}
end
end