openstack/puppet-cloudkitty
Code Issues Proposed changes

Merge "Replace wsgi script"

Browse Source
This commit is contained in:
Zuul
2025-08-23 04:08:35 +00:00
committed by Gerrit Code Review
parent 71a3256a88 752534d0f0
commit f2dde47bef
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/params.pp
View File

@@ -5,6 +5,8 @@
class cloudkitty::params { class cloudkitty::params {
include openstacklib::defaults include openstacklib::defaults
$pyver3 = $openstacklib::defaults::pyver3
$client_package_name = 'python3-cloudkittyclient' $client_package_name = 'python3-cloudkittyclient'
$api_service_name = 'cloudkitty-api' $api_service_name = 'cloudkitty-api'
$processor_service_name = 'cloudkitty-processor' $processor_service_name = 'cloudkitty-processor'
@@ -18,7 +20,7 @@ class cloudkitty::params {
$api_package_name = 'openstack-cloudkitty-api' $api_package_name = 'openstack-cloudkitty-api'
$processor_package_name = 'openstack-cloudkitty-processor' $processor_package_name = 'openstack-cloudkitty-processor'
$common_package_name = 'openstack-cloudkitty-common' $common_package_name = 'openstack-cloudkitty-common'
$cloudkitty_wsgi_script_source = '/usr/bin/cloudkitty-api' $cloudkitty_wsgi_script_source = "/usr/lib/python${pyver3}/site-packages/cloudkitty/wsgi/api.py"
$cloudkitty_wsgi_script_path = '/var/www/cgi-bin/cloudkitty' $cloudkitty_wsgi_script_path = '/var/www/cgi-bin/cloudkitty'
} }
'Debian': { 'Debian': {

6
spec/classes/cloudkitty_wsgi_apache_spec.rb
View File

@@ -19,7 +19,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 => '/usr/bin/cloudkitty-api', :wsgi_script_source => platform_params[:wsgi_script_source],
:headers => nil, :headers => nil,
:request_headers => nil, :request_headers => nil,
:custom_wsgi_process_options => {}, :custom_wsgi_process_options => {},
@@ -65,7 +65,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 => '/usr/bin/cloudkitty-api', :wsgi_script_source => platform_params[:wsgi_script_source],
:headers => ['set X-XSS-Protection "1; mode=block"'], :headers => ['set X-XSS-Protection "1; mode=block"'],
:request_headers => ['set Content-Type "application/json"'], :request_headers => ['set Content-Type "application/json"'],
:custom_wsgi_process_options => { :custom_wsgi_process_options => {
@@ -154,10 +154,12 @@ 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/bin/cloudkitty-api',
} }
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/python3.9/site-packages/cloudkitty/wsgi/api.py',
} }
end end
end end