Fix wrong wsgi script path
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:
parent
60d5294c9b
commit
8588e30b39
|
@ -4,6 +4,7 @@
|
|||
#
|
||||
class mistral::params {
|
||||
include openstacklib::defaults
|
||||
$pyver3 = $::openstacklib::defaults::pyver3
|
||||
|
||||
$client_package = 'python3-mistralclient'
|
||||
$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_service_name = 'openstack-mistral-event-engine'
|
||||
$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': {
|
||||
$common_package_name = 'mistral-common'
|
||||
|
@ -36,7 +37,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/bin/mistral-wsgi-api'
|
||||
$mistral_wsgi_script_source = "/usr/lib/python${pyver3}/dist-packages/mistral/api/wsgi.py"
|
||||
}
|
||||
default: {
|
||||
fail("Unsupported osfamily: ${facts['os']['family']}")
|
||||
|
|
|
@ -158,12 +158,12 @@ describe 'mistral::wsgi::apache' do
|
|||
when 'Debian'
|
||||
{
|
||||
: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'
|
||||
{
|
||||
: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
|
||||
|
|
Loading…
Reference in New Issue