openstack/puppet-mistral
Code Issues Proposed changes

Fix wrong wsgi script path

Browse Source 
Since [1] the wsgi script is not generated with PBR anymore.

[1] https://review.opendev.org/c/openstack/mistral/+/900566

Closes-Bug: #2045782
Change-Id: I15ce5ed4f607b0df9b386bb67326db3f790a3d37
This commit is contained in:
Joel Capitao
2023-12-06 17:16:27 +01:00
parent 60d5294c9b
commit 8588e30b39
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/params.pp
View File

@@ -4,6 +4,7 @@
# #
class mistral::params { class mistral::params {
include openstacklib::defaults include openstacklib::defaults
$pyver3 = $::openstacklib::defaults::pyver3
$client_package = 'python3-mistralclient' $client_package = 'python3-mistralclient'
$db_sync_command = 'mistral-db-manage --config-file=/etc/mistral/mistral.conf upgrade head' $db_sync_command = 'mistral-db-manage --config-file=/etc/mistral/mistral.conf upgrade head'
@@ -23,7 +24,7 @@ class mistral::params {
$event_engine_package_name = 'openstack-mistral-event-engine' $event_engine_package_name = 'openstack-mistral-event-engine'
$event_engine_service_name = 'openstack-mistral-event-engine' $event_engine_service_name = 'openstack-mistral-event-engine'
$mistral_wsgi_script_path = '/var/www/cgi-bin/mistral' $mistral_wsgi_script_path = '/var/www/cgi-bin/mistral'
$mistral_wsgi_script_source = '/usr/bin/mistral-wsgi-api' $mistral_wsgi_script_source = "/usr/lib/python${pyver3}/site-packages/mistral/api/wsgi.py"
} }
'Debian': { 'Debian': {
$common_package_name = 'mistral-common' $common_package_name = 'mistral-common'
@@ -36,7 +37,7 @@ class mistral::params {
$event_engine_package_name = 'mistral-event-engine' $event_engine_package_name = 'mistral-event-engine'
$event_engine_service_name = 'mistral-event-engine' $event_engine_service_name = 'mistral-event-engine'
$mistral_wsgi_script_path = '/usr/lib/cgi-bin/mistral' $mistral_wsgi_script_path = '/usr/lib/cgi-bin/mistral'
$mistral_wsgi_script_source = '/usr/bin/mistral-wsgi-api' $mistral_wsgi_script_source = "/usr/lib/python${pyver3}/dist-packages/mistral/api/wsgi.py"
} }
default: { default: {
fail("Unsupported osfamily: ${facts['os']['family']}") fail("Unsupported osfamily: ${facts['os']['family']}")

4
spec/classes/mistral_wsgi_apache_spec.rb
View File

@@ -158,12 +158,12 @@ describe 'mistral::wsgi::apache' do
when 'Debian' when 'Debian'
{ {
:wsgi_script_path => '/usr/lib/cgi-bin/mistral', :wsgi_script_path => '/usr/lib/cgi-bin/mistral',
:wsgi_script_source => '/usr/bin/mistral-wsgi-api' :wsgi_script_source => '/usr/lib/python3/dist-packages/mistral/api/wsgi.py'
} }
when 'RedHat' when 'RedHat'
{ {
:wsgi_script_path => '/var/www/cgi-bin/mistral', :wsgi_script_path => '/var/www/cgi-bin/mistral',
:wsgi_script_source => '/usr/bin/mistral-wsgi-api' :wsgi_script_source => '/usr/lib/python3.9/site-packages/mistral/api/wsgi.py'
} }
end end