openstack/puppet-neutron
Code Issues Proposed changes

Merge "Replace wsgi script"

Browse Source
This commit is contained in:
Zuul
2025-08-23 05:20:35 +00:00
committed by Gerrit Code Review
parent d32c6f9e0a 6ce175e704
commit 9b9f885d18
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/params.pp
View File

@@ -5,6 +5,8 @@
class neutron::params { class neutron::params {
include openstacklib::defaults include openstacklib::defaults
$pyver3 = $openstacklib::defaults::pyver3
$client_package = 'python3-neutronclient' $client_package = 'python3-neutronclient'
$ovs_agent_service = 'neutron-openvswitch-agent' $ovs_agent_service = 'neutron-openvswitch-agent'
$macvtap_agent_service = 'neutron-macvtap-agent' $macvtap_agent_service = 'neutron-macvtap-agent'
@@ -61,7 +63,7 @@ class neutron::params {
$metadata_agent_package = undef $metadata_agent_package = undef
$l3_agent_package = undef $l3_agent_package = undef
$neutron_wsgi_script_path = '/var/www/cgi-bin/neutron' $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_package = 'python3-networking-baremetal'
$networking_baremetal_agent_package = 'python3-ironic-neutron-agent' $networking_baremetal_agent_package = 'python3-ironic-neutron-agent'
$networking_baremetal_agent_service = 'ironic-neutron-agent' $networking_baremetal_agent_service = 'ironic-neutron-agent'

2
spec/classes/neutron_wsgi_apache_spec.rb
View File

@@ -161,7 +161,7 @@ describe 'neutron::wsgi::apache' do
when 'RedHat' when 'RedHat'
{ {
:wsgi_script_path => '/var/www/cgi-bin/neutron', :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 end