diff --git a/manifests/params.pp b/manifests/params.pp index 866d503..d8160bc 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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']}") diff --git a/spec/classes/magnum_wsgi_apache_spec.rb b/spec/classes/magnum_wsgi_apache_spec.rb index 32837d6..f25c85f 100644 --- a/spec/classes/magnum_wsgi_apache_spec.rb +++ b/spec/classes/magnum_wsgi_apache_spec.rb @@ -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