openstack
/
puppet-mistral
Code Issues Proposed changes

Merge "Revert "Fix wrong wsgi script path""

This commit is contained in:
Zuul 2024-03-18 15:48:34 +00:00 committed by Gerrit Code Review
parent ace4e1f837 fb05772b3f
commit 029a6266e5
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/params.pp
View File

@ -4,7 +4,6 @@
#
class mistral::params {
include openstacklib::defaults
$pyver3 = $::openstacklib::defaults::pyver3
$client_package = 'python3-mistralclient'
$db_sync_command = 'mistral-db-manage upgrade head'
@ -24,7 +23,7 @@ class mistral::params {
$event_engine_package_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_source = "/usr/lib/python${pyver3}/site-packages/mistral/api/wsgi.py"
$mistral_wsgi_script_source = '/usr/bin/mistral-wsgi-api'
}
'Debian': {
$common_package_name = 'mistral-common'
@ -37,7 +36,7 @@ class mistral::params {
$event_engine_package_name = 'mistral-event-engine'
$event_engine_service_name = 'mistral-event-engine'
$mistral_wsgi_script_path = '/usr/lib/cgi-bin/mistral'
$mistral_wsgi_script_source = "/usr/lib/python${pyver3}/dist-packages/mistral/api/wsgi.py"
$mistral_wsgi_script_source = '/usr/bin/mistral-wsgi-api'
}
default: {
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'
{
:wsgi_script_path => '/usr/lib/cgi-bin/mistral',
:wsgi_script_source => '/usr/lib/python3/dist-packages/mistral/api/wsgi.py'
:wsgi_script_source => '/usr/bin/mistral-wsgi-api'
}
when 'RedHat'
{
:wsgi_script_path => '/var/www/cgi-bin/mistral',
:wsgi_script_source => '/usr/lib/python3.9/site-packages/mistral/api/wsgi.py'
:wsgi_script_source => '/usr/bin/mistral-wsgi-api'
}
end