From 752534d0f0aa2ab9ac295a9106db4c3b53c9e34f Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Thu, 21 Aug 2025 12:14:49 +0900
Subject: [PATCH] Replace wsgi script

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>
---
 manifests/params.pp                         | 4 +++-
 spec/classes/cloudkitty_wsgi_apache_spec.rb | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 5384cc9..88e815b 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -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': {
diff --git a/spec/classes/cloudkitty_wsgi_apache_spec.rb b/spec/classes/cloudkitty_wsgi_apache_spec.rb
index 7726ce0..0b2c383 100644
--- a/spec/classes/cloudkitty_wsgi_apache_spec.rb
+++ b/spec/classes/cloudkitty_wsgi_apache_spec.rb
@@ -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