openstack
/
puppet-nova
Code Issues Proposed changes

Merge "Get rid of the $pyvers variable"

This commit is contained in:
Zuul 2021-06-14 22:53:27 +00:00 committed by Gerrit Code Review
parent a0a5349796 f92f8d0787
commit e2576fa00b
3 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/params.pp
View File

@ -4,8 +4,8 @@
# should be considered to be constant # should be considered to be constant
class nova::params { class nova::params {
include openstacklib::defaults include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$client_package = "python${pyvers}-novaclient" $client_package = 'python3-novaclient'
$group = 'nova' $group = 'nova'
case $::osfamily { case $::osfamily {
@ -13,10 +13,10 @@ class nova::params {
# package names # package names
$api_package_name = 'openstack-nova-api' $api_package_name = 'openstack-nova-api'
$common_package_name = 'openstack-nova-common' $common_package_name = 'openstack-nova-common'
$python_package_name = "python${pyvers}-nova" $python_package_name = 'python3-nova'
$compute_package_name = 'openstack-nova-compute' $compute_package_name = 'openstack-nova-compute'
$conductor_package_name = 'openstack-nova-conductor' $conductor_package_name = 'openstack-nova-conductor'
$novajoin_package_name = "python${pyvers}-novajoin" $novajoin_package_name = 'python3-novajoin'
$doc_package_name = 'openstack-nova-doc' $doc_package_name = 'openstack-nova-doc'
$libvirt_package_name = 'libvirt' $libvirt_package_name = 'libvirt'
$libvirt_guests_package_name = 'libvirt-client' $libvirt_guests_package_name = 'libvirt-client'
@ -66,7 +66,7 @@ class nova::params {
# package names # package names
$api_package_name = 'nova-api' $api_package_name = 'nova-api'
$common_package_name = 'nova-common' $common_package_name = 'nova-common'
$python_package_name = "python${pyvers}-nova" $python_package_name = 'python3-nova'
$compute_package_name = 'nova-compute' $compute_package_name = 'nova-compute'
$conductor_package_name = 'nova-conductor' $conductor_package_name = 'nova-conductor'
$novajoin_package_name = undef $novajoin_package_name = undef

8
spec/classes/nova_client_spec.rb
View File

@ -29,15 +29,7 @@ describe 'nova::client' do
when 'Debian' when 'Debian'
{ :client_package_name => 'python3-novaclient' } { :client_package_name => 'python3-novaclient' }
when 'RedHat' when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{ :client_package_name => 'python3-novaclient' } { :client_package_name => 'python3-novaclient' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :client_package_name => 'python3-novaclient' }
else
{ :client_package_name => 'python-novaclient' }
end
end
end end
end end

8
spec/classes/nova_metadata_novajoin_api_spec.rb
View File

@ -206,15 +206,7 @@ describe 'nova::metadata::novajoin::api' do
it_behaves_like 'nova::metadata::novajoin::api' it_behaves_like 'nova::metadata::novajoin::api'
it_behaves_like 'nova::metadata::novajoin::api on RedHat' it_behaves_like 'nova::metadata::novajoin::api on RedHat'
let (:platform_params) do let (:platform_params) do
if facts[:operatingsystem] == 'Fedora'
{ :novajoin_package_name => 'python3-novajoin' } { :novajoin_package_name => 'python3-novajoin' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :novajoin_package_name => 'python3-novajoin' }
else
{ :novajoin_package_name => 'python-novajoin' }
end
end
end end
end end
end end