openstack/puppet-cloudkitty
Code Issues Proposed changes

Replace wsgi script

Browse Source 
pbr is removing support for wsgi_script due to changes in setuptools.
Use the wsgi script module python code instead.

Note that this change only touches CentOS code. Ubuntu and Debian will
be updated later when we bump the release used in our testing.

Change-Id: Idbf5014e2ece156be96099fedda802700530c54e
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-21 12:14:49 +09:00
parent c7aee692bb
commit 752534d0f0
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 {
include openstacklib::defaults
$pyver3 = $openstacklib::defaults::pyver3
$client_package_name = 'python3-cloudkittyclient'
$api_service_name = 'cloudkitty-api'
$processor_service_name = 'cloudkitty-processor'
@@ -18,7 +20,7 @@ class cloudkitty::params {
$api_package_name = 'openstack-cloudkitty-api'
$processor_package_name = 'openstack-cloudkitty-processor'
$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'
}
'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_script_dir => platform_params[:wsgi_script_path],
:wsgi_script_file => 'app',
:wsgi_script_source => '/usr/bin/cloudkitty-api',
:wsgi_script_source => platform_params[:wsgi_script_source],
:headers => nil,
:request_headers => nil,
:custom_wsgi_process_options => {},
@@ -65,7 +65,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 => '/usr/bin/cloudkitty-api',
:wsgi_script_source => platform_params[:wsgi_script_source],
:headers => ['set X-XSS-Protection "1; mode=block"'],
:request_headers => ['set Content-Type "application/json"'],
:custom_wsgi_process_options => {
@@ -154,10 +154,12 @@ describe 'cloudkitty::wsgi::apache' do
when 'Debian'
{
:wsgi_script_path => '/usr/lib/cgi-bin/cloudkitty',
:wsgi_script_source => '/usr/bin/cloudkitty-api',
}
when 'RedHat'
{
:wsgi_script_path => '/var/www/cgi-bin/cloudkitty',
:wsgi_script_source => '/usr/lib/python3.9/site-packages/cloudkitty/wsgi/api.py',
}
end
end