diff --git a/manifests/params.pp b/manifests/params.pp index 8e63807b9..43d7073bc 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -5,6 +5,8 @@ class nova::params { include openstacklib::defaults + $pyver3 = $openstacklib::defaults::pyver3 + $client_package = 'python3-novaclient' $user = 'nova' $group = 'nova' @@ -64,8 +66,8 @@ class nova::params { $root_helper = 'sudo nova-rootwrap' $lock_path = '/var/lib/nova/tmp' $nova_wsgi_script_path = '/var/www/cgi-bin/nova' - $nova_api_wsgi_script_source = '/usr/bin/nova-api-wsgi' - $nova_metadata_wsgi_script_source = '/usr/bin/nova-metadata-wsgi' + $nova_api_wsgi_script_source = "/usr/lib/python${pyver3}/site-packages/nova/wsgi/osapi_compute.py" + $nova_metadata_wsgi_script_source = "/usr/lib/python${pyver3}/site-packages/nova/wsgi/metadata.py" } 'Debian': { # package names diff --git a/spec/classes/nova_wsgi_apache_api_spec.rb b/spec/classes/nova_wsgi_apache_api_spec.rb index 5473c8411..dc0ebb6db 100644 --- a/spec/classes/nova_wsgi_apache_api_spec.rb +++ b/spec/classes/nova_wsgi_apache_api_spec.rb @@ -243,7 +243,7 @@ describe 'nova::wsgi::apache_api' do when 'RedHat' { :wsgi_script_path => '/var/www/cgi-bin/nova', - :api_wsgi_script_source => '/usr/bin/nova-api-wsgi', + :api_wsgi_script_source => '/usr/lib/python3.9/site-packages/nova/wsgi/osapi_compute.py', } end end diff --git a/spec/classes/nova_wsgi_apache_metadata_spec.rb b/spec/classes/nova_wsgi_apache_metadata_spec.rb index a81450bf6..535b6ce8e 100644 --- a/spec/classes/nova_wsgi_apache_metadata_spec.rb +++ b/spec/classes/nova_wsgi_apache_metadata_spec.rb @@ -229,7 +229,7 @@ describe 'nova::wsgi::apache_metadata' do when 'RedHat' { :wsgi_script_path => '/var/www/cgi-bin/nova', - :metadata_wsgi_script_source => '/usr/bin/nova-metadata-wsgi', + :metadata_wsgi_script_source => '/usr/lib/python3.9/site-packages/nova/wsgi/metadata.py', } end end