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: Ie3a0740a69733728a254e20bd8029f04bc4106ab
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-20 18:27:29 +09:00
parent b6209648fe
commit 9fe12a5c2a
2 changed files with 10 additions and 8 deletions

View File

@@ -5,6 +5,8 @@
class heat::params { class heat::params {
include openstacklib::defaults include openstacklib::defaults
$pyver3 = $openstacklib::defaults::pyver3
$client_package_name = 'python3-heatclient' $client_package_name = 'python3-heatclient'
$user = 'heat' $user = 'heat'
$group = 'heat' $group = 'heat'
@@ -22,8 +24,8 @@ class heat::params {
$engine_service_name = 'openstack-heat-engine' $engine_service_name = 'openstack-heat-engine'
# WSGI scripts # WSGI scripts
$heat_wsgi_script_path = '/var/www/cgi-bin/heat' $heat_wsgi_script_path = '/var/www/cgi-bin/heat'
$heat_api_wsgi_script_source = '/usr/bin/heat-wsgi-api' $heat_api_wsgi_script_source = "/usr/lib/python${pyver3}/site-packages/heat/wsgi/api.py"
$heat_api_cfn_wsgi_script_source = '/usr/bin/heat-wsgi-api-cfn' $heat_api_cfn_wsgi_script_source = "/usr/lib/python${pyver3}/site-packages/heat/wsgi/cfn.py"
} }
'Debian': { 'Debian': {
# package names # package names

View File

@@ -89,8 +89,8 @@ describe 'heat::wsgi::apache' do
} }
when 'RedHat' when 'RedHat'
{ :wsgi_script_dir => '/var/www/cgi-bin/heat', { :wsgi_script_dir => '/var/www/cgi-bin/heat',
:script_source_api => '/usr/bin/heat-wsgi-api', :script_source_api => '/usr/lib/python3.9/site-packages/heat/wsgi/api.py',
:script_source_cfn => '/usr/bin/heat-wsgi-api-cfn', :script_source_cfn => '/usr/lib/python3.9/site-packages/heat/wsgi/cfn.py',
} }
end end
end end