openstack/puppet-cloudkitty
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: Ifaf069874a53fedabd252e55f5f20a9f66ba0756
This commit is contained in:
ZhongShengping
2018-03-26 14:48:30 +08:00
parent c8d3dd2218
commit 8871a9e82f
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/params.pp
View File

@@ -17,7 +17,7 @@ class cloudkitty::params {
$processor_package_name = 'openstack-cloudkitty-processor' $processor_package_name = 'openstack-cloudkitty-processor'
$ui_package_name = 'openstack-cloudkitty-ui' $ui_package_name = 'openstack-cloudkitty-ui'
$common_package_name = 'openstack-cloudkitty-common' $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' $cloudkitty_wsgi_script_path = '/var/www/cgi-bin/cloudkitty'
} }
'Debian': { 'Debian': {
@@ -26,7 +26,7 @@ class cloudkitty::params {
$processor_package_name = 'cloudkitty-processor' $processor_package_name = 'cloudkitty-processor'
$ui_package_name = 'cloudkitty-dashboard' $ui_package_name = 'cloudkitty-dashboard'
$common_package_name = 'cloudkitty-common' $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' $cloudkitty_wsgi_script_path = '/usr/lib/cgi-bin/cloudkitty'
} }
default: { default: {

6
spec/classes/cloudkitty_wsgi_apache_spec.rb
View File

@@ -21,7 +21,7 @@ describe 'cloudkitty::wsgi::apache' do
:wsgi_process_group => 'cloudkitty', :wsgi_process_group => 'cloudkitty',
:wsgi_script_dir => platform_params[:wsgi_script_path], :wsgi_script_dir => platform_params[:wsgi_script_path],
:wsgi_script_file => 'app', :wsgi_script_file => 'app',
:wsgi_script_source => platform_params[:wsgi_script_source], :wsgi_script_source => '/usr/bin/cloudkitty-api',
:custom_wsgi_process_options => {}, :custom_wsgi_process_options => {},
:access_log_file => false, :access_log_file => false,
:access_log_format => false, :access_log_format => false,
@@ -64,7 +64,7 @@ describe 'cloudkitty::wsgi::apache' do
:wsgi_process_group => 'cloudkitty', :wsgi_process_group => 'cloudkitty',
:wsgi_script_dir => platform_params[:wsgi_script_path], :wsgi_script_dir => platform_params[:wsgi_script_path],
:wsgi_script_file => 'app', :wsgi_script_file => 'app',
:wsgi_script_source => platform_params[:wsgi_script_source], :wsgi_script_source => '/usr/bin/cloudkitty-api',
:custom_wsgi_process_options => { :custom_wsgi_process_options => {
'python_path' => '/my/python/admin/path', 'python_path' => '/my/python/admin/path',
}, },
@@ -92,12 +92,10 @@ describe 'cloudkitty::wsgi::apache' do
when 'Debian' when 'Debian'
{ {
:wsgi_script_path => '/usr/lib/cgi-bin/cloudkitty', :wsgi_script_path => '/usr/lib/cgi-bin/cloudkitty',
:wsgi_script_source => '/usr/lib/python2.7/dist-packages/cloudkitty/api/app.wsgi'
} }
when 'RedHat' when 'RedHat'
{ {
:wsgi_script_path => '/var/www/cgi-bin/cloudkitty', :wsgi_script_path => '/var/www/cgi-bin/cloudkitty',
:wsgi_script_source => '/usr/lib/python2.7/site-packages/cloudkitty/api/app.wsgi'
} }
end end
end end