From 1e062750902dff9e0698bb686dcfe2440d091c47 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 21 Aug 2025 11:50:33 +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: I40fcf5749200c6619b50ee7bcff2b89af1e2b7a9 Signed-off-by: Takashi Kajinami --- manifests/params.pp | 4 +++- spec/classes/ironic_wsgi_apache_spec.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 318a93ff..2e24fa3e 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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 diff --git a/spec/classes/ironic_wsgi_apache_spec.rb b/spec/classes/ironic_wsgi_apache_spec.rb index a09b11d2..450287ff 100644 --- a/spec/classes/ironic_wsgi_apache_spec.rb +++ b/spec/classes/ironic_wsgi_apache_spec.rb @@ -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