openstack/puppet-nova
Code Issues Proposed changes

Merge "Replace wsgi script"

Browse Source
This commit is contained in:
Zuul
2025-08-23 05:41:50 +00:00
committed by Gerrit Code Review
parent 73fafb67eb 39b08cc8a1
commit c8ac3e285a
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/params.pp
View File

@@ -5,6 +5,8 @@
class nova::params { class nova::params {
include openstacklib::defaults include openstacklib::defaults
$pyver3 = $openstacklib::defaults::pyver3
$client_package = 'python3-novaclient' $client_package = 'python3-novaclient'
$user = 'nova' $user = 'nova'
$group = 'nova' $group = 'nova'
@@ -63,8 +65,8 @@ class nova::params {
# redhat specific config defaults # redhat specific config defaults
$lock_path = '/var/lib/nova/tmp' $lock_path = '/var/lib/nova/tmp'
$nova_wsgi_script_path = '/var/www/cgi-bin/nova' $nova_wsgi_script_path = '/var/www/cgi-bin/nova'
$nova_api_wsgi_script_source = '/usr/bin/nova-api-wsgi' $nova_api_wsgi_script_source = "/usr/lib/python${pyver3}/site-packages/nova/wsgi/osapi_compute.py"
$nova_metadata_wsgi_script_source = '/usr/bin/nova-metadata-wsgi' $nova_metadata_wsgi_script_source = "/usr/lib/python${pyver3}/site-packages/nova/wsgi/metadata.py"
} }
'Debian': { 'Debian': {
# package names # package names

2
spec/classes/nova_wsgi_apache_api_spec.rb
View File

@@ -243,7 +243,7 @@ describe 'nova::wsgi::apache_api' do
when 'RedHat' when 'RedHat'
{ {
:wsgi_script_path => '/var/www/cgi-bin/nova', :wsgi_script_path => '/var/www/cgi-bin/nova',
:api_wsgi_script_source => '/usr/bin/nova-api-wsgi', :api_wsgi_script_source => '/usr/lib/python3.9/site-packages/nova/wsgi/osapi_compute.py',
} }
end end
end end

2
spec/classes/nova_wsgi_apache_metadata_spec.rb
View File

@@ -229,7 +229,7 @@ describe 'nova::wsgi::apache_metadata' do
when 'RedHat' when 'RedHat'
{ {
:wsgi_script_path => '/var/www/cgi-bin/nova', :wsgi_script_path => '/var/www/cgi-bin/nova',
:metadata_wsgi_script_source => '/usr/bin/nova-metadata-wsgi', :metadata_wsgi_script_source => '/usr/lib/python3.9/site-packages/nova/wsgi/metadata.py',
} }
end end
end end