From 6ce175e7044e896f36b3e4dd87eceb7b09f520ac Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 20 Aug 2025 21:25:14 +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: I3983443871ad838b33ea2aabbcda59ba61f6c294 Signed-off-by: Takashi Kajinami --- manifests/params.pp | 4 +++- spec/classes/neutron_wsgi_apache_spec.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 175825e0d..525d91efd 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -5,6 +5,8 @@ class neutron::params { include openstacklib::defaults + $pyver3 = $openstacklib::defaults::pyver3 + $client_package = 'python3-neutronclient' $ovs_agent_service = 'neutron-openvswitch-agent' $macvtap_agent_service = 'neutron-macvtap-agent' @@ -63,7 +65,7 @@ class neutron::params { $metadata_agent_package = undef $l3_agent_package = undef $neutron_wsgi_script_path = '/var/www/cgi-bin/neutron' - $neutron_wsgi_script_source = '/usr/bin/neutron-api' + $neutron_wsgi_script_source = "/usr/lib/python${pyver3}/site-packages/neutron/wsgi/api.py" $networking_baremetal_package = 'python3-networking-baremetal' $networking_baremetal_agent_package = 'python3-ironic-neutron-agent' $networking_baremetal_agent_service = 'ironic-neutron-agent' diff --git a/spec/classes/neutron_wsgi_apache_spec.rb b/spec/classes/neutron_wsgi_apache_spec.rb index 3cc13abf8..9ed9d7147 100644 --- a/spec/classes/neutron_wsgi_apache_spec.rb +++ b/spec/classes/neutron_wsgi_apache_spec.rb @@ -161,7 +161,7 @@ describe 'neutron::wsgi::apache' do when 'RedHat' { :wsgi_script_path => '/var/www/cgi-bin/neutron', - :wsgi_script_source => '/usr/bin/neutron-api' + :wsgi_script_source => '/usr/lib/python3.9/site-packages/neutron/wsgi/api.py', } end