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: I40fcf5749200c6619b50ee7bcff2b89af1e2b7a9
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-21 11:50:33 +09:00
parent 9fd0f46f34
commit 1e06275090
2 changed files with 4 additions and 2 deletions

View File

@@ -22,6 +22,8 @@
class ironic::params {
include openstacklib::defaults
$pyver3 = $openstacklib::defaults::pyver3
$dbsync_command = 'ironic-dbsync'
$inspector_dbsync_command =
'ironic-inspector-dbsync --config-file /etc/ironic-inspector/inspector.conf upgrade'
@@ -60,7 +62,7 @@ class ironic::params {
$uefi_pxe_bootfile_name = 'bootx64.efi'
$uefi_ipxe_bootfile_name = 'snponly.efi'
$ironic_wsgi_script_path = '/var/www/cgi-bin/ironic'
$ironic_wsgi_script_source = '/usr/bin/ironic-api-wsgi'
$ironic_wsgi_script_source = "/usr/lib/python${pyver3}/site-packages/ironic/wsgi/__init__.py"
$inspector_wsgi_script_path = '/var/www/cgi-bin/ironic-inspector'
$inspector_wsgi_script_source = '/usr/bin/ironic-inspector-api-wsgi'
$xinetd_available = false

View File

@@ -161,7 +161,7 @@ describe 'ironic::wsgi::apache' do
when 'RedHat'
{
:wsgi_script_path => '/var/www/cgi-bin/ironic',
:wsgi_script_source => '/usr/bin/ironic-api-wsgi',
:wsgi_script_source => '/usr/lib/python3.9/site-packages/ironic/wsgi/__init__.py',
}
end
end