Adjust wsgi script path
The script generated by pbr no longer exists. Depends-on: https://review.opendev.org/980609 Change-Id: I71c17160d0ce81066e022f494a54b8d862290598 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
+4
-2
@@ -5,6 +5,8 @@
|
||||
class magnum::params {
|
||||
include openstacklib::defaults
|
||||
|
||||
$pybasedir = $openstacklib::defaults::pybasedir
|
||||
|
||||
$user = 'magnum'
|
||||
$group = 'magnum'
|
||||
|
||||
@@ -19,7 +21,7 @@ class magnum::params {
|
||||
$conductor_service = 'openstack-magnum-conductor'
|
||||
$client_package = 'python3-magnumclient'
|
||||
$wsgi_script_path = '/var/www/cgi-bin/magnum'
|
||||
$wsgi_script_source = '/usr/bin/magnum-api-wsgi'
|
||||
$wsgi_script_source = "${pybasedir}/magnum/wsgi/api.py"
|
||||
}
|
||||
'Debian': {
|
||||
# package names
|
||||
@@ -31,7 +33,7 @@ class magnum::params {
|
||||
$conductor_service = 'magnum-conductor'
|
||||
$client_package = 'python3-magnumclient'
|
||||
$wsgi_script_path = '/usr/lib/cgi-bin/magnum'
|
||||
$wsgi_script_source = '/usr/bin/magnum-api-wsgi'
|
||||
$wsgi_script_source = "${pybasedir}/magnum/wsgi/api.py"
|
||||
}
|
||||
default: {
|
||||
fail("Unsupported osfamily: ${facts['os']['family']}")
|
||||
|
||||
@@ -154,12 +154,12 @@ describe 'magnum::wsgi::apache' do
|
||||
when 'Debian'
|
||||
{
|
||||
:wsgi_script_path => '/usr/lib/cgi-bin/magnum',
|
||||
:wsgi_script_source => '/usr/bin/magnum-api-wsgi'
|
||||
:wsgi_script_source => '/usr/lib/python3/dist-packages/magnum/wsgi/api.py',
|
||||
}
|
||||
when 'RedHat'
|
||||
{
|
||||
:wsgi_script_path => '/var/www/cgi-bin/magnum',
|
||||
:wsgi_script_source => '/usr/bin/magnum-api-wsgi'
|
||||
:wsgi_script_source => '/usr/lib/python3.9/site-packages/magnum/wsgi/api.py',
|
||||
}
|
||||
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user